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

Cleanup mapType

Browse Source
This commit is contained in:
Alexander Udalov
2012-09-13 15:29:01 +04:00
parent 9e55fd219e
commit 8ac83f08ac
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+6 -12
View File
@@ -218,10 +218,10 @@ public class JetTypeMapper extends BindingTraceAware {
@NotNull @NotNull
public Type mapType(JetType jetType, @Nullable BothSignatureWriter signatureVisitor, @NotNull JetTypeMapperMode kind) { public Type mapType(JetType jetType, @Nullable BothSignatureWriter signatureVisitor, @NotNull JetTypeMapperMode kind) {
Type known = null; Type known = null;
ClassifierDescriptor classifier = jetType.getConstructor().getDeclarationDescriptor(); DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor();
if (mapBuiltinsToJava) { if (mapBuiltinsToJava) {
if (classifier instanceof ClassDescriptor) { if (descriptor instanceof ClassDescriptor) {
known = KotlinToJavaTypesMap.getInstance().getJavaAnalog(jetType); known = KotlinToJavaTypesMap.getInstance().getJavaAnalog(jetType);
} }
} }
@@ -253,7 +253,6 @@ public class JetTypeMapper extends BindingTraceAware {
if (constructor instanceof IntersectionTypeConstructor) { if (constructor instanceof IntersectionTypeConstructor) {
jetType = CommonSupertypes.commonSupertype(new ArrayList<JetType>(constructor.getSupertypes())); jetType = CommonSupertypes.commonSupertype(new ArrayList<JetType>(constructor.getSupertypes()));
} }
DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor();
if (descriptor == null) { if (descriptor == null) {
throw new UnsupportedOperationException("no descriptor for type constructor of " + jetType); throw new UnsupportedOperationException("no descriptor for type constructor of " + jetType);
@@ -271,9 +270,7 @@ public class JetTypeMapper extends BindingTraceAware {
return asmType; return asmType;
} }
if (descriptor instanceof ClassDescriptor if (mapBuiltinsToJava && descriptor instanceof ClassDescriptor && JetStandardLibrary.getInstance().isArray(jetType)) {
&& JetStandardLibrary.getInstance().isArray(jetType)
&& mapBuiltinsToJava) {
if (jetType.getArguments().size() != 1) { if (jetType.getArguments().size() != 1) {
throw new UnsupportedOperationException("arrays must have one type argument"); throw new UnsupportedOperationException("arrays must have one type argument");
} }
@@ -297,7 +294,7 @@ public class JetTypeMapper extends BindingTraceAware {
} }
if (descriptor instanceof ClassDescriptor) { if (descriptor instanceof ClassDescriptor) {
JvmClassName name = getJvmInternalName(bindingTrace, (ClassDescriptor) descriptor); JvmClassName name = getJvmInternalName(bindingTrace, descriptor);
Type asmType; Type asmType;
if (kind == JetTypeMapperMode.TRAIT_IMPL) { if (kind == JetTypeMapperMode.TRAIT_IMPL) {
asmType = Type.getObjectType(name.getInternalName() + JvmAbi.TRAIT_IMPL_SUFFIX); asmType = Type.getObjectType(name.getInternalName() + JvmAbi.TRAIT_IMPL_SUFFIX);
@@ -314,12 +311,9 @@ public class JetTypeMapper extends BindingTraceAware {
} }
if (descriptor instanceof TypeParameterDescriptor) { if (descriptor instanceof TypeParameterDescriptor) {
TypeParameterDescriptor typeParameterDescriptor = (TypeParameterDescriptor) descriptor;
Type type = mapType(((TypeParameterDescriptor) descriptor).getUpperBoundsAsType(), kind); Type type = mapType(typeParameterDescriptor.getUpperBoundsAsType(), kind);
if (signatureVisitor != null) { if (signatureVisitor != null) {
TypeParameterDescriptor typeParameterDescriptor =
(TypeParameterDescriptor) jetType.getConstructor().getDeclarationDescriptor();
assert typeParameterDescriptor != null;
signatureVisitor.writeTypeVariable(typeParameterDescriptor.getName(), jetType.isNullable(), type); signatureVisitor.writeTypeVariable(typeParameterDescriptor.getName(), jetType.isNullable(), type);
} }
checkValidType(type); checkValidType(type);