From 92ff6abf50ae07bfdb8c975ee1974da8a2b224a2 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 19 Oct 2012 13:00:39 +0400 Subject: [PATCH] Common method used --- .../jet/lang/types/lang/KotlinBuiltIns.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 69ad6391f5f..426fc822b4e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -284,17 +284,15 @@ public class KotlinBuiltIns { } private void makePrimitive(PrimitiveType primitiveType) { - ClassDescriptor clazz = (ClassDescriptor) getBuiltInsScope().getClassifier(primitiveType.getTypeName()); - assert clazz != null : "ClassDescriptor not found for " + primitiveType; - ClassDescriptor arrayClazz = (ClassDescriptor) getBuiltInsScope().getClassifier(primitiveType.getArrayTypeName()); - assert arrayClazz != null : "Array ClassDescriptor not found for " + primitiveType; - JetTypeImpl type = new JetTypeImpl(clazz); - JetTypeImpl arrayType = new JetTypeImpl(arrayClazz); + ClassDescriptor theClass = getBuiltInClassByName(primitiveType.getTypeName().getName()); + JetType type = new JetTypeImpl(theClass); + ClassDescriptor arrayClass = getBuiltInClassByName(primitiveType.getArrayTypeName().getName()); + JetType arrayType = new JetTypeImpl(arrayClass); - primitiveTypeToClass.put(primitiveType, clazz); + primitiveTypeToClass.put(primitiveType, theClass); primitiveTypeToJetType.put(primitiveType, type); primitiveTypeToNullableJetType.put(primitiveType, TypeUtils.makeNullable(type)); - primitiveTypeToArrayClass.put(primitiveType, arrayClazz); + primitiveTypeToArrayClass.put(primitiveType, arrayClass); primitiveTypeToArrayJetType.put(primitiveType, arrayType); primitiveJetTypeToJetArrayType.put(type, arrayType); jetArrayTypeToPrimitiveJetType.put(arrayType, type);