2 files changed, 27 insertions, 27 deletions

diff --git a/sources/scalac/atree/APrimitive.java b/sources/scalac/atree/APrimitive.java
index 90d9ca516d..034a9f4d19 100644
--- a/sources/scalac/atree/APrimitive.java
+++ b/sources/scalac/atree/APrimitive.java
@@ -17,33 +17,33 @@ public class APrimitive {
     // type : (type) => type
     // range: type <- { BOOL, Ix, Ux, Rx }
     // jvm  : {i, l, f, d}neg
-    public case Negation(ATypeKind type);
+    public case Negation(ATypeKind kind);
 
     // type : zero ? (type) => BOOL : (type,type) => BOOL
     // range: type <- { BOOL, Ix, Ux, Rx, REF }
     // jvm  : if{eq, ne, lt, ge, le, gt}, if{null, nonnull}
     //        if_icmp{eq, ne, lt, ge, le, gt}, if_acmp{eq,ne}
-    public case Test(ATestOp op, ATypeKind type, boolean zero);
+    public case Test(ATestOp op, ATypeKind kind, boolean zero);
 
     // type : (type,type) => I4
     // range: type <- { Ix, Ux, Rx }
     // jvm  : lcmp, {f, d}cmp{l, g}
-    public case Comparison(AComparisonOp op, ATypeKind type);
+    public case Comparison(AComparisonOp op, ATypeKind kind);
 
     // type : (type,type) => type
     // range: type <- { Ix, Ux, Rx }
     // jvm  : {i, l, f, d}{add, sub, mul, div, rem}
-    public case Arithmetic(AArithmeticOp op, ATypeKind type);
+    public case Arithmetic(AArithmeticOp op, ATypeKind kind);
 
     // type : (type,type) => type
     // range: type <- { BOOL, Ix, Ux }
     // jvm  : {i, l}{and, or, xor}
-    public case Logical(ALogicalOp op, ATypeKind type);
+    public case Logical(ALogicalOp op, ATypeKind kind);
 
     // type : (type,I4) => type
     // range: type <- { Ix, Ux }
     // jvm  : {i, l}{shl, ushl, shr}
-    public case Shift(AShiftOp op, ATypeKind type);
+    public case Shift(AShiftOp op, ATypeKind kind);
 
     // type : (src) => dst
     // range: src,dst <- { Ix, Ux, Rx }
@@ -53,7 +53,7 @@ public class APrimitive {
     // type : (Array[REF]) => I4
     // range: type <- { BOOL, Ix, Ux, Rx, REF }
     // jvm  : arraylength
-    public case ArrayLength(ATypeKind type);
+    public case ArrayLength(ATypeKind kind);
 
     // type : (lf,rg) => STR
     // range: lf,rg <- { BOOL, Ix, Ux, Rx, REF, STR }
diff --git a/sources/scalac/atree/ATreePrinter.java b/sources/scalac/atree/ATreePrinter.java
index 7caa05952b..abbca028c9 100644
--- a/sources/scalac/atree/ATreePrinter.java
+++ b/sources/scalac/atree/ATreePrinter.java
@@ -466,22 +466,22 @@ public class ATreePrinter {
     /** Prints the primitive. */
     public ATreePrinter printPrimitive(APrimitive primitive) {
         switch (primitive) {
-        case Negation(ATypeKind type):
-            return printPrimitiveOp("NEG", type);
-        case Test(ATestOp op, ATypeKind type, boolean zero):
-            return printPrimitiveOp(op.toString() + (zero ? "Z" : ""), type);
-        case Comparison(AComparisonOp op, ATypeKind type):
-            return printPrimitiveOp(op.toString(), type);
-        case Arithmetic(AArithmeticOp op, ATypeKind type):
-            return printPrimitiveOp(op.toString(), type);
-        case Logical(ALogicalOp op, ATypeKind type):
-            return printPrimitiveOp(op.toString(), type);
-        case Shift(AShiftOp op, ATypeKind type):
-            return printPrimitiveOp(op.toString(), type);
+        case Negation(ATypeKind kind):
+            return printPrimitiveOp("NEG", kind);
+        case Test(ATestOp op, ATypeKind kind, boolean zero):
+            return printPrimitiveOp(op.toString() + (zero ? "Z" : ""), kind);
+        case Comparison(AComparisonOp op, ATypeKind kind):
+            return printPrimitiveOp(op.toString(), kind);
+        case Arithmetic(AArithmeticOp op, ATypeKind kind):
+            return printPrimitiveOp(op.toString(), kind);
+        case Logical(ALogicalOp op, ATypeKind kind):
+            return printPrimitiveOp(op.toString(), kind);
+        case Shift(AShiftOp op, ATypeKind kind):
+            return printPrimitiveOp(op.toString(), kind);
         case Conversion(ATypeKind src, ATypeKind dst):
             return printPrimitiveOp("CONV", src, dst);
-        case ArrayLength(ATypeKind type):
-            return printPrimitiveOp("LENGTH", type);
+        case ArrayLength(ATypeKind kind):
+            return printPrimitiveOp("LENGTH", kind);
         case StringConcat(ATypeKind lf, ATypeKind rg):
             return printPrimitiveOp("CONCAT", lf, rg);
         default:
@@ -489,16 +489,16 @@ public class ATreePrinter {
         }
     }
 
-    /** Prints the primitive operation of given type. */
-    public ATreePrinter printPrimitiveOp(String op, ATypeKind type) {
-        return printPrimitiveOp(op, type, null);
+    /** Prints the primitive operation of given type kind. */
+    public ATreePrinter printPrimitiveOp(String op, ATypeKind kind) {
+        return printPrimitiveOp(op, kind, null);
     }
 
     /** Prints the primitive operation of given types. */
-    public ATreePrinter printPrimitiveOp(String op, ATypeKind t1,ATypeKind t2){
+    public ATreePrinter printPrimitiveOp(String op, ATypeKind k1,ATypeKind k2){
         print('<').print(op).print('>');
-        if (t1 != null && global.uniqid) print('#').print(t1.toString());
-        if (t2 != null && global.uniqid) print(',').print(t2.toString());
+        if (k1 != null && global.uniqid) print('#').print(k1.toString());
+        if (k2 != null && global.uniqid) print(',').print(k2.toString());
         return this;
     }