azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Common method used

Browse Source
This commit is contained in:
Andrey Breslav
2012-10-19 13:00:39 +04:00
parent a69b13d67f
commit 92ff6abf50
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+6 -8
View File
@@ -284,17 +284,15 @@ public class KotlinBuiltIns {
} }
private void makePrimitive(PrimitiveType primitiveType) { private void makePrimitive(PrimitiveType primitiveType) {
ClassDescriptor clazz = (ClassDescriptor) getBuiltInsScope().getClassifier(primitiveType.getTypeName()); ClassDescriptor theClass = getBuiltInClassByName(primitiveType.getTypeName().getName());
assert clazz != null : "ClassDescriptor not found for " + primitiveType; JetType type = new JetTypeImpl(theClass);
ClassDescriptor arrayClazz = (ClassDescriptor) getBuiltInsScope().getClassifier(primitiveType.getArrayTypeName()); ClassDescriptor arrayClass = getBuiltInClassByName(primitiveType.getArrayTypeName().getName());
assert arrayClazz != null : "Array ClassDescriptor not found for " + primitiveType; JetType arrayType = new JetTypeImpl(arrayClass);
JetTypeImpl type = new JetTypeImpl(clazz);
JetTypeImpl arrayType = new JetTypeImpl(arrayClazz);
primitiveTypeToClass.put(primitiveType, clazz); primitiveTypeToClass.put(primitiveType, theClass);
primitiveTypeToJetType.put(primitiveType, type); primitiveTypeToJetType.put(primitiveType, type);
primitiveTypeToNullableJetType.put(primitiveType, TypeUtils.makeNullable(type)); primitiveTypeToNullableJetType.put(primitiveType, TypeUtils.makeNullable(type));
primitiveTypeToArrayClass.put(primitiveType, arrayClazz); primitiveTypeToArrayClass.put(primitiveType, arrayClass);
primitiveTypeToArrayJetType.put(primitiveType, arrayType); primitiveTypeToArrayJetType.put(primitiveType, arrayType);
primitiveJetTypeToJetArrayType.put(type, arrayType); primitiveJetTypeToJetArrayType.put(type, arrayType);
jetArrayTypeToPrimitiveJetType.put(arrayType, type); jetArrayTypeToPrimitiveJetType.put(arrayType, type);