- Replaced some calls to Symbol.typeConstructor...

- Replaced some calls to Symbol.typeConstructor by calls to
JavaTypeFactory.classType

4 files changed, 18 insertions, 18 deletions

diff --git a/sources/scalac/symtab/classfile/AttributeParser.java b/sources/scalac/symtab/classfile/AttributeParser.java
index db3d6e91a7..23c84bf662 100644
--- a/sources/scalac/symtab/classfile/AttributeParser.java
+++ b/sources/scalac/symtab/classfile/AttributeParser.java
@@ -126,7 +126,7 @@ public class AttributeParser implements ClassfileConstants {
                     	continue;
                 	AliasTypeSymbol alias =
 						new AliasTypeSymbol(Position.NOPOS, name.toTypeName(), outer, 0);
-					alias.setInfo(inner.typeConstructor());
+					alias.setInfo(parser.make.classType(inner));
 					alias.allConstructors()
 						.setInfo(new Type.MethodType(Symbol.EMPTY_ARRAY, inner.info()));
 					Scope.Entry e = parser.statics.lookupEntry(alias.name); // Why is this ??????
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index c56889eae3..5dcb3c1769 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -79,7 +79,7 @@ public class CLRClassParser extends ClassParser {
 				   (staticsClass.owner().thisType(),
 				    staticsClass, scalac.symtab.Type.EMPTY_ARRAY));
 	}
-        scalac.symtab.Type ctype = clazz.typeConstructor();
+        scalac.symtab.Type ctype = make.classType(clazz);
 
 	// import nested types
 	Type[] nestedTypes = type.getNestedTypes();
@@ -280,7 +280,7 @@ public class CLRClassParser extends ClassParser {
 	    || (type.IsArray() && getCLSType(type.GetElementType()) == null))
 	    return null;
 	//Symbol s = importer.getSymbol(type);
-	//scalac.symtab.Type t = s != null ? s.typeConstructor() : getCLRType(type);
+	//scalac.symtab.Type t = s != null ? make.classType(s) : getCLRType(type);
 	return getCLRType(type);
     }
 
@@ -310,7 +310,7 @@ public class CLRClassParser extends ClassParser {
 	if (type.IsArray())
 	    return make.arrayType(getCLRType(type.GetElementType()));
 	Symbol s = importer.getSymbol(type);
-	return s != null ? s.typeConstructor() : getClassType(type);
+	return s != null ? make.classType(s) : getClassType(type);
     }
 
     protected static int translateAttributes(Type type) {
diff --git a/sources/scalac/symtab/classfile/ClassfileParser.java b/sources/scalac/symtab/classfile/ClassfileParser.java
index 6aa8d599c6..567fd79321 100644
--- a/sources/scalac/symtab/classfile/ClassfileParser.java
+++ b/sources/scalac/symtab/classfile/ClassfileParser.java
@@ -56,8 +56,8 @@ public class ClassfileParser implements ClassfileConstants {
         this.global = global;
         this.in = in;
         this.c = c;
-        this.ctype = c.typeConstructor();
         this.make = new JavaTypeCreator(global.definitions);
+        this.ctype = make.classType(c);
         this.sigs = new Signatures(global, make);
         this.pool = new ConstantPool(in, sigs);
         this.attrib = new AttributeParser(in, pool, this);
diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java
index d361d4cd12..e81f828ca6 100644
--- a/sources/scalac/symtab/classfile/JavaTypeCreator.java
+++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java
@@ -36,19 +36,19 @@ public class JavaTypeCreator implements JavaTypeFactory {
 
     public JavaTypeCreator(Definitions definitions) {
         this.definitions = definitions;
-        this.ANY_TYPE = definitions.ANY_CLASS.typeConstructor();
-        this.DOUBLE_TYPE = definitions.DOUBLE_CLASS.typeConstructor();
-        this.FLOAT_TYPE = definitions.FLOAT_CLASS.typeConstructor();
-        this.LONG_TYPE = definitions.LONG_CLASS.typeConstructor();
-        this.INT_TYPE = definitions.INT_CLASS.typeConstructor();
-        this.CHAR_TYPE = definitions.CHAR_CLASS.typeConstructor();
-        this.SHORT_TYPE = definitions.SHORT_CLASS.typeConstructor();
-        this.BYTE_TYPE = definitions.BYTE_CLASS.typeConstructor();
-        this.BOOLEAN_TYPE = definitions.BOOLEAN_CLASS.typeConstructor();
-        this.UNIT_TYPE = definitions.UNIT_CLASS.typeConstructor();
-        this.OBJECT_TYPE = definitions.OBJECT_CLASS.typeConstructor();
-        this.STRING_TYPE = definitions.STRING_CLASS.typeConstructor();
-        this.ARRAY_TYPE = definitions.ARRAY_CLASS.typeConstructor();
+        this.ANY_TYPE = classType(definitions.ANY_CLASS);
+        this.DOUBLE_TYPE = classType(definitions.DOUBLE_CLASS);
+        this.FLOAT_TYPE = classType(definitions.FLOAT_CLASS);
+        this.LONG_TYPE = classType(definitions.LONG_CLASS);
+        this.INT_TYPE = classType(definitions.INT_CLASS);
+        this.CHAR_TYPE = classType(definitions.CHAR_CLASS);
+        this.SHORT_TYPE = classType(definitions.SHORT_CLASS);
+        this.BYTE_TYPE = classType(definitions.BYTE_CLASS);
+        this.BOOLEAN_TYPE = classType(definitions.BOOLEAN_CLASS);
+        this.UNIT_TYPE = classType(definitions.UNIT_CLASS);
+        this.OBJECT_TYPE = classType(definitions.OBJECT_CLASS);
+        this.STRING_TYPE = classType(definitions.STRING_CLASS);
+        this.ARRAY_TYPE = classType(definitions.ARRAY_CLASS);
     }
 
     public Type anyType() {