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

Drop unused primitive wrapper mapping in JavaToKotlinClassMap

Browse Source
This commit is contained in:
Alexander Udalov
2015-04-21 03:37:22 +03:00
parent 6a158c2b16
commit d86b9c8f54
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
+1 -3
View File
@@ -49,12 +49,10 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements
for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) { for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) {
PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType(); PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType();
String name = jvmPrimitiveType.getName(); String name = jvmPrimitiveType.getName();
FqName wrapperFqName = jvmPrimitiveType.getWrapperFqName();
register(wrapperFqName, builtIns.getPrimitiveClassDescriptor(primitiveType)); register(jvmPrimitiveType.getWrapperFqName(), builtIns.getPrimitiveClassDescriptor(primitiveType));
primitiveTypesMap.put(name, builtIns.getPrimitiveJetType(primitiveType)); primitiveTypesMap.put(name, builtIns.getPrimitiveJetType(primitiveType));
primitiveTypesMap.put("[" + name, builtIns.getPrimitiveArrayJetType(primitiveType)); primitiveTypesMap.put("[" + name, builtIns.getPrimitiveArrayJetType(primitiveType));
primitiveTypesMap.put(wrapperFqName.asString(), builtIns.getNullablePrimitiveJetType(primitiveType));
} }
primitiveTypesMap.put("void", builtIns.getUnitType()); primitiveTypesMap.put("void", builtIns.getUnitType());
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
-8
View File
@@ -101,7 +101,6 @@ public class KotlinBuiltIns {
private final ModuleDescriptorImpl builtInsModule; private final ModuleDescriptorImpl builtInsModule;
private final BuiltinsPackageFragment builtinsPackageFragment; private final BuiltinsPackageFragment builtinsPackageFragment;
private final Map<PrimitiveType, JetType> primitiveTypeToNullableJetType;
private final Map<PrimitiveType, JetType> primitiveTypeToArrayJetType; private final Map<PrimitiveType, JetType> primitiveTypeToArrayJetType;
private final Map<JetType, JetType> primitiveJetTypeToJetArrayType; private final Map<JetType, JetType> primitiveJetTypeToJetArrayType;
private final Map<JetType, JetType> jetArrayTypeToPrimitiveJetType; private final Map<JetType, JetType> jetArrayTypeToPrimitiveJetType;
@@ -129,7 +128,6 @@ public class KotlinBuiltIns {
builtinsPackageFragment = (BuiltinsPackageFragment) single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME)); builtinsPackageFragment = (BuiltinsPackageFragment) single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME));
primitiveTypeToNullableJetType = new EnumMap<PrimitiveType, JetType>(PrimitiveType.class);
primitiveTypeToArrayJetType = new EnumMap<PrimitiveType, JetType>(PrimitiveType.class); primitiveTypeToArrayJetType = new EnumMap<PrimitiveType, JetType>(PrimitiveType.class);
primitiveJetTypeToJetArrayType = new HashMap<JetType, JetType>(); primitiveJetTypeToJetArrayType = new HashMap<JetType, JetType>();
jetArrayTypeToPrimitiveJetType = new HashMap<JetType, JetType>(); jetArrayTypeToPrimitiveJetType = new HashMap<JetType, JetType>();
@@ -145,7 +143,6 @@ public class KotlinBuiltIns {
JetType type = getBuiltInTypeByClassName(primitiveType.getTypeName().asString()); JetType type = getBuiltInTypeByClassName(primitiveType.getTypeName().asString());
JetType arrayType = getBuiltInTypeByClassName(primitiveType.getArrayTypeName().asString()); JetType arrayType = getBuiltInTypeByClassName(primitiveType.getArrayTypeName().asString());
primitiveTypeToNullableJetType.put(primitiveType, TypeUtils.makeNullable(type));
primitiveTypeToArrayJetType.put(primitiveType, arrayType); primitiveTypeToArrayJetType.put(primitiveType, arrayType);
primitiveJetTypeToJetArrayType.put(type, arrayType); primitiveJetTypeToJetArrayType.put(type, arrayType);
jetArrayTypeToPrimitiveJetType.put(arrayType, type); jetArrayTypeToPrimitiveJetType.put(arrayType, type);
@@ -511,11 +508,6 @@ public class KotlinBuiltIns {
return getPrimitiveClassDescriptor(type).getDefaultType(); return getPrimitiveClassDescriptor(type).getDefaultType();
} }
@NotNull
public JetType getNullablePrimitiveJetType(@NotNull PrimitiveType primitiveType) {
return primitiveTypeToNullableJetType.get(primitiveType);
}
@NotNull @NotNull
public JetType getByteType() { public JetType getByteType() {
return getPrimitiveJetType(BYTE); return getPrimitiveJetType(BYTE);