- Changed _TYPE methods in Definitions for prim...

- Changed _TYPE methods in Definitions for primitive value and array
types

2 files changed, 16 insertions, 16 deletions

diff --git a/sources/scalac/typechecker/ConstantFolder.java b/sources/scalac/typechecker/ConstantFolder.java
index 04d788d7f5..d796279365 100644
--- a/sources/scalac/typechecker/ConstantFolder.java
+++ b/sources/scalac/typechecker/ConstantFolder.java
@@ -252,11 +252,11 @@ public class ConstantFolder {
     public AConstant cast(AConstant value, Type type) {
         switch (value.kind()) {
         case UNIT:
-            if (type.isSameAs(definitions.UNIT_CLASS.type()))
+            if (type.isSameAs(definitions.void_TYPE())) // !!! -> UNIT_TYPE()
                 return value;
             return null;
         case BOOL:
-            if (type.isSameAs(definitions.BOOLEAN_TYPE()))
+            if (type.isSameAs(definitions.boolean_TYPE()))
                 return value;
             return null;
         case U1:
@@ -269,19 +269,19 @@ public class ConstantFolder {
         case I8:
         case R4:
         case R8:
-            if (type.isSameAs(definitions.BYTE_TYPE()))
+            if (type.isSameAs(definitions.byte_TYPE()))
                 return AConstant.BYTE(value.byteValue());
-            if (type.isSameAs(definitions.SHORT_TYPE()))
+            if (type.isSameAs(definitions.short_TYPE()))
                 return AConstant.SHORT(value.shortValue());
-            if (type.isSameAs(definitions.CHAR_TYPE()))
+            if (type.isSameAs(definitions.char_TYPE()))
                 return AConstant.CHAR(value.charValue());
-            if (type.isSameAs(definitions.INT_TYPE()))
+            if (type.isSameAs(definitions.int_TYPE()))
                 return AConstant.INT(value.intValue());
-            if (type.isSameAs(definitions.LONG_TYPE()))
+            if (type.isSameAs(definitions.long_TYPE()))
                 return AConstant.LONG(value.longValue());
-            if (type.isSameAs(definitions.FLOAT_TYPE()))
+            if (type.isSameAs(definitions.float_TYPE()))
                 return AConstant.FLOAT(value.floatValue());
-            if (type.isSameAs(definitions.DOUBLE_TYPE()))
+            if (type.isSameAs(definitions.double_TYPE()))
                 return AConstant.DOUBLE(value.doubleValue());
             return null;
         case STR:
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index b44e52b640..9358f39722 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -589,7 +589,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 		tree.pos, PRIVATE | SYNTHETIC, m_eqname);
             Symbol m_eqarg = m_eq.newVParam(tree.pos, SYNTHETIC, name, sym.type());
             m_eq.setInfo(
-                Type.MethodType(new Symbol[] {m_eqarg}, defs.UNIT_TYPE()));
+                Type.MethodType(new Symbol[] {m_eqarg}, defs.void_TYPE()));
             Tree m_eqdef = gen.DefDef(m_eq,
                 gen.Assign(gen.mkLocalRef(tree.pos, mvar), gen.Ident(tree.pos, m_eqarg)));
             sym.owner().members().enterOrOverload(m_eq);
@@ -693,7 +693,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	Symbol seSym =
             clazz.newMethod( clazz.pos, FINAL|OVERRIDE, Names.caseElement );
 	Symbol seParam =
-            seSym.newVParam( clazz.pos, 0, Names.n, defs.INT_TYPE() );
+            seSym.newVParam( clazz.pos, 0, Names.n, defs.int_TYPE() );
         seSym.setInfo(
             Type.MethodType( new Symbol[]{ seParam }, defs.ANY_TYPE() ));
 	clazz.info().members().enter( seSym );
@@ -717,7 +717,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	Symbol seSym =
             clazz.newMethod( clazz.pos, FINAL|OVERRIDE, Names.caseArity );
         seSym.setInfo(
-            Type.PolyType( Symbol.EMPTY_ARRAY, defs.INT_TYPE() ));
+            Type.PolyType( Symbol.EMPTY_ARRAY, defs.int_TYPE() ));
 	clazz.info().members().enter( seSym );
 	Tree[] fields = caseFields( clazz );
 	return gen.DefDef(seSym, gen.mkIntLit( clazz.pos, fields.length ));
@@ -729,7 +729,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	Symbol equalsParam = equalsSym.newVParam(
             clazz.pos, 0, Names.that, defs.ANY_TYPE());
 	equalsSym.setInfo(
-	    Type.MethodType(new Symbol[]{equalsParam}, defs.BOOLEAN_TYPE()));
+	    Type.MethodType(new Symbol[]{equalsParam}, defs.boolean_TYPE()));
 	clazz.info().members().enter(equalsSym);
 	Tree[] fields = caseFields(clazz);
 	Type testtp = clazz.type();
@@ -792,7 +792,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	private Tree tagMethod(ClassSymbol clazz) {
             int flags =clazz.isSubClass(defs.SCALAOBJECT_CLASS) ? OVERRIDE : 0;
 	    Symbol tagSym = clazz.newMethod(clazz.pos, flags, Names.tag)
-		.setInfo(Type.MethodType(Symbol.EMPTY_ARRAY, defs.INT_TYPE()));
+		.setInfo(Type.MethodType(Symbol.EMPTY_ARRAY, defs.int_TYPE()));
 	    clazz.info().members().enter(tagSym);
 	    return gen.DefDef(
 		tagSym,
@@ -809,9 +809,9 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	Tree[] fields = caseFields(clazz);
 	Symbol getClassMethod = getNullaryMemberMethod(clazz.type(), Names.getClass);
 	Symbol addMethod = getUnaryMemberMethod(
-	    defs.INT_TYPE(), Names.ADD, defs.INT_TYPE());
+	    defs.int_TYPE(), Names.ADD, defs.int_TYPE());
 	Symbol mulMethod = getUnaryMemberMethod(
-	    defs.INT_TYPE(), Names.MUL, defs.INT_TYPE());
+	    defs.int_TYPE(), Names.MUL, defs.int_TYPE());
 	Tree body =
 	    gen.Apply(
 		gen.Select(