Added primitive operations to (Byte|Char|Short|...

Added primitive operations to (Byte|Char|Short|Int).java so that less
boxing is done.

1 files changed, 56 insertions, 56 deletions

diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java
index b2cef185dd..6a67e123e6 100644
--- a/sources/scalac/backend/Primitives.java
+++ b/sources/scalac/backend/Primitives.java
@@ -502,25 +502,25 @@ public class Primitives {
         // scala.Byte
         addAll(defs.BYTE_CLASS, Names.coerce, Primitive.COERCE, 5);
         //addAll(defs.BYTE_CLASS, Names.EQ, Primitive.EQ, 5);
-        addAllPrimitive(defs.BYTE_CLASS, Names.EQ, Primitive.EQ, 4);
+        addAllPrimitive(defs.BYTE_CLASS, Names.EQ, Primitive.EQ, 7);
         //addAll(defs.BYTE_CLASS, Names.NE, Primitive.NE, 5);
-        addAllPrimitive(defs.BYTE_CLASS, Names.NE, Primitive.NE, 4);
+        addAllPrimitive(defs.BYTE_CLASS, Names.NE, Primitive.NE, 7);
         //addAll(defs.BYTE_CLASS, Names.equals, Primitive.EQUALS, 1);
         addAll(defs.BYTE_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
         addAll(defs.BYTE_CLASS, Names.toString, Primitive.TOSTRING, 1);
         addAll(defs.BYTE_CLASS, Names.NOT, Primitive.NOT, 1);
-        addAdd(defs.BYTE_CLASS, 4);
-        addSub(defs.BYTE_CLASS, 4);
-        addAll(defs.BYTE_CLASS, Names.MUL, Primitive.MUL, 4);
-        addAll(defs.BYTE_CLASS, Names.DIV, Primitive.DIV, 4);
-        addAll(defs.BYTE_CLASS, Names.MOD, Primitive.MOD, 4);
-        addAll(defs.BYTE_CLASS, Names.LT, Primitive.LT, 4);
-        addAll(defs.BYTE_CLASS, Names.LE, Primitive.LE, 4);
-        addAll(defs.BYTE_CLASS, Names.GT, Primitive.GT, 4);
-        addAll(defs.BYTE_CLASS, Names.GE, Primitive.GE, 4);
-        addAll(defs.BYTE_CLASS, Names.OR, Primitive.OR, 2);
-        addAll(defs.BYTE_CLASS, Names.XOR, Primitive.XOR, 2);
-        addAll(defs.BYTE_CLASS, Names.AND, Primitive.AND, 2);
+        addAdd(defs.BYTE_CLASS, 7);
+        addSub(defs.BYTE_CLASS, 7);
+        addAll(defs.BYTE_CLASS, Names.MUL, Primitive.MUL, 7);
+        addAll(defs.BYTE_CLASS, Names.DIV, Primitive.DIV, 7);
+        addAll(defs.BYTE_CLASS, Names.MOD, Primitive.MOD, 7);
+        addAll(defs.BYTE_CLASS, Names.LT, Primitive.LT, 7);
+        addAll(defs.BYTE_CLASS, Names.LE, Primitive.LE, 7);
+        addAll(defs.BYTE_CLASS, Names.GT, Primitive.GT, 7);
+        addAll(defs.BYTE_CLASS, Names.GE, Primitive.GE, 7);
+        addAll(defs.BYTE_CLASS, Names.OR, Primitive.OR, 5);
+        addAll(defs.BYTE_CLASS, Names.XOR, Primitive.XOR, 5);
+        addAll(defs.BYTE_CLASS, Names.AND, Primitive.AND, 5);
         addAll(defs.BYTE_CLASS, Names.LSL, Primitive.LSL, 2);
         addAll(defs.BYTE_CLASS, Names.LSR, Primitive.LSR, 2);
         addAll(defs.BYTE_CLASS, Names.ASR, Primitive.ASR, 2);
@@ -528,25 +528,25 @@ public class Primitives {
         // scala.Short
         addAll(defs.SHORT_CLASS, Names.coerce, Primitive.COERCE, 4);
         //addAll(defs.SHORT_CLASS, Names.EQ, Primitive.EQ, 5);
-        addAllPrimitive(defs.SHORT_CLASS, Names.EQ, Primitive.EQ, 4);
+        addAllPrimitive(defs.SHORT_CLASS, Names.EQ, Primitive.EQ, 7);
         //addAll(defs.SHORT_CLASS, Names.NE, Primitive.NE, 5);
-        addAllPrimitive(defs.SHORT_CLASS, Names.NE, Primitive.NE, 4);
+        addAllPrimitive(defs.SHORT_CLASS, Names.NE, Primitive.NE, 7);
         //addAll(defs.SHORT_CLASS, Names.equals, Primitive.EQUALS, 1);
         addAll(defs.SHORT_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
         addAll(defs.SHORT_CLASS, Names.toString, Primitive.TOSTRING, 1);
         addAll(defs.SHORT_CLASS, Names.NOT, Primitive.NOT, 1);
-        addAdd(defs.SHORT_CLASS, 4);
-        addSub(defs.SHORT_CLASS, 4);
-        addAll(defs.SHORT_CLASS, Names.MUL, Primitive.MUL, 4);
-        addAll(defs.SHORT_CLASS, Names.DIV, Primitive.DIV, 4);
-        addAll(defs.SHORT_CLASS, Names.MOD, Primitive.MOD, 4);
-        addAll(defs.SHORT_CLASS, Names.LT, Primitive.LT, 4);
-        addAll(defs.SHORT_CLASS, Names.LE, Primitive.LE, 4);
-        addAll(defs.SHORT_CLASS, Names.GT, Primitive.GT, 4);
-        addAll(defs.SHORT_CLASS, Names.GE, Primitive.GE, 4);
-        addAll(defs.SHORT_CLASS, Names.OR, Primitive.OR, 2);
-        addAll(defs.SHORT_CLASS, Names.XOR, Primitive.XOR, 2);
-        addAll(defs.SHORT_CLASS, Names.AND, Primitive.AND, 2);
+        addAdd(defs.SHORT_CLASS, 7);
+        addSub(defs.SHORT_CLASS, 7);
+        addAll(defs.SHORT_CLASS, Names.MUL, Primitive.MUL, 7);
+        addAll(defs.SHORT_CLASS, Names.DIV, Primitive.DIV, 7);
+        addAll(defs.SHORT_CLASS, Names.MOD, Primitive.MOD, 7);
+        addAll(defs.SHORT_CLASS, Names.LT, Primitive.LT, 7);
+        addAll(defs.SHORT_CLASS, Names.LE, Primitive.LE, 7);
+        addAll(defs.SHORT_CLASS, Names.GT, Primitive.GT, 7);
+        addAll(defs.SHORT_CLASS, Names.GE, Primitive.GE, 7);
+        addAll(defs.SHORT_CLASS, Names.OR, Primitive.OR, 5);
+        addAll(defs.SHORT_CLASS, Names.XOR, Primitive.XOR, 5);
+        addAll(defs.SHORT_CLASS, Names.AND, Primitive.AND, 5);
         addAll(defs.SHORT_CLASS, Names.LSL, Primitive.LSL, 2);
         addAll(defs.SHORT_CLASS, Names.LSR, Primitive.LSR, 2);
         addAll(defs.SHORT_CLASS, Names.ASR, Primitive.ASR, 2);
@@ -554,25 +554,25 @@ public class Primitives {
         // scala.Char
         addAll(defs.CHAR_CLASS, Names.coerce, Primitive.COERCE, 4);
         //addAll(defs.CHAR_CLASS, Names.EQ, Primitive.EQ, 5);
-        addAllPrimitive(defs.CHAR_CLASS, Names.EQ, Primitive.EQ, 4);
+        addAllPrimitive(defs.CHAR_CLASS, Names.EQ, Primitive.EQ, 7);
         //addAll(defs.CHAR_CLASS, Names.NE, Primitive.NE, 5);
-        addAllPrimitive(defs.CHAR_CLASS, Names.NE, Primitive.NE, 4);
+        addAllPrimitive(defs.CHAR_CLASS, Names.NE, Primitive.NE, 7);
         //addAll(defs.CHAR_CLASS, Names.equals, Primitive.EQUALS, 1);
         addAll(defs.CHAR_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
         addAll(defs.CHAR_CLASS, Names.toString, Primitive.TOSTRING, 1);
         addAll(defs.CHAR_CLASS, Names.NOT, Primitive.NOT, 1);
-        addAdd(defs.CHAR_CLASS, 4);
-        addSub(defs.CHAR_CLASS, 4);
-        addAll(defs.CHAR_CLASS, Names.MUL, Primitive.MUL, 4);
-        addAll(defs.CHAR_CLASS, Names.DIV, Primitive.DIV, 4);
-        addAll(defs.CHAR_CLASS, Names.MOD, Primitive.MOD, 4);
-        addAll(defs.CHAR_CLASS, Names.LT, Primitive.LT, 4);
-        addAll(defs.CHAR_CLASS, Names.LE, Primitive.LE, 4);
-        addAll(defs.CHAR_CLASS, Names.GT, Primitive.GT, 4);
-        addAll(defs.CHAR_CLASS, Names.GE, Primitive.GE, 4);
-        addAll(defs.CHAR_CLASS, Names.OR, Primitive.OR, 2);
-        addAll(defs.CHAR_CLASS, Names.XOR, Primitive.XOR, 2);
-        addAll(defs.CHAR_CLASS, Names.AND, Primitive.AND, 2);
+        addAdd(defs.CHAR_CLASS, 7);
+        addSub(defs.CHAR_CLASS, 7);
+        addAll(defs.CHAR_CLASS, Names.MUL, Primitive.MUL, 7);
+        addAll(defs.CHAR_CLASS, Names.DIV, Primitive.DIV, 7);
+        addAll(defs.CHAR_CLASS, Names.MOD, Primitive.MOD, 7);
+        addAll(defs.CHAR_CLASS, Names.LT, Primitive.LT, 7);
+        addAll(defs.CHAR_CLASS, Names.LE, Primitive.LE, 7);
+        addAll(defs.CHAR_CLASS, Names.GT, Primitive.GT, 7);
+        addAll(defs.CHAR_CLASS, Names.GE, Primitive.GE, 7);
+        addAll(defs.CHAR_CLASS, Names.OR, Primitive.OR, 5);
+        addAll(defs.CHAR_CLASS, Names.XOR, Primitive.XOR, 5);
+        addAll(defs.CHAR_CLASS, Names.AND, Primitive.AND, 5);
         addAll(defs.CHAR_CLASS, Names.LSL, Primitive.LSL, 2);
         addAll(defs.CHAR_CLASS, Names.LSR, Primitive.LSR, 2);
         addAll(defs.CHAR_CLASS, Names.ASR, Primitive.ASR, 2);
@@ -580,25 +580,25 @@ public class Primitives {
         // scala.Int
         addAll(defs.INT_CLASS, Names.coerce, Primitive.COERCE, 3);
         //addAll(defs.INT_CLASS, Names.EQ, Primitive.EQ, 5);
-        addAllPrimitive(defs.INT_CLASS, Names.EQ, Primitive.EQ, 4);
+        addAllPrimitive(defs.INT_CLASS, Names.EQ, Primitive.EQ, 7);
         //addAll(defs.INT_CLASS, Names.NE, Primitive.NE, 5);
-        addAllPrimitive(defs.INT_CLASS, Names.NE, Primitive.NE, 4);
+        addAllPrimitive(defs.INT_CLASS, Names.NE, Primitive.NE, 7);
         //addAll(defs.INT_CLASS, Names.equals, Primitive.EQUALS, 1);
         addAll(defs.INT_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
         addAll(defs.INT_CLASS, Names.toString, Primitive.TOSTRING, 1);
         addAll(defs.INT_CLASS, Names.NOT, Primitive.NOT, 1);
-        addAdd(defs.INT_CLASS, 4);
-        addSub(defs.INT_CLASS, 4);
-        addAll(defs.INT_CLASS, Names.MUL, Primitive.MUL, 4);
-        addAll(defs.INT_CLASS, Names.DIV, Primitive.DIV, 4);
-        addAll(defs.INT_CLASS, Names.MOD, Primitive.MOD, 4);
-        addAll(defs.INT_CLASS, Names.LT, Primitive.LT, 4);
-        addAll(defs.INT_CLASS, Names.LE, Primitive.LE, 4);
-        addAll(defs.INT_CLASS, Names.GT, Primitive.GT, 4);
-        addAll(defs.INT_CLASS, Names.GE, Primitive.GE, 4);
-        addAll(defs.INT_CLASS, Names.OR, Primitive.OR, 2);
-        addAll(defs.INT_CLASS, Names.XOR, Primitive.XOR, 2);
-        addAll(defs.INT_CLASS, Names.AND, Primitive.AND, 2);
+        addAdd(defs.INT_CLASS, 7);
+        addSub(defs.INT_CLASS, 7);
+        addAll(defs.INT_CLASS, Names.MUL, Primitive.MUL, 7);
+        addAll(defs.INT_CLASS, Names.DIV, Primitive.DIV, 7);
+        addAll(defs.INT_CLASS, Names.MOD, Primitive.MOD, 7);
+        addAll(defs.INT_CLASS, Names.LT, Primitive.LT, 7);
+        addAll(defs.INT_CLASS, Names.LE, Primitive.LE, 7);
+        addAll(defs.INT_CLASS, Names.GT, Primitive.GT, 7);
+        addAll(defs.INT_CLASS, Names.GE, Primitive.GE, 7);
+        addAll(defs.INT_CLASS, Names.OR, Primitive.OR, 5);
+        addAll(defs.INT_CLASS, Names.XOR, Primitive.XOR, 5);
+        addAll(defs.INT_CLASS, Names.AND, Primitive.AND, 5);
         addAll(defs.INT_CLASS, Names.LSL, Primitive.LSL, 2);
         addAll(defs.INT_CLASS, Names.LSR, Primitive.LSR, 2);
         addAll(defs.INT_CLASS, Names.ASR, Primitive.ASR, 2);