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

Drop obsolete synthetic class kind in KotlinClassHeader

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-28 17:45:36 +03:00
parent 9552accaec
commit fc88a0186f
3 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
+1 -6
View File
@@ -23,7 +23,6 @@ class KotlinClassHeader(
val version: BinaryVersion,
val annotationData: Array<String>?,
val strings: Array<String>?,
val syntheticClassKind: String?,
val filePartClassNames: Array<String>?,
val multifileClassName: String?,
val isInterfaceDefaultImpls: Boolean,
@@ -37,11 +36,7 @@ class KotlinClassHeader(
SYNTHETIC_CLASS
}
override fun toString() =
"$kind " +
(if (isLocalClass) "(local) " else "") +
(if (syntheticClassKind != null) "$syntheticClassKind " else "") +
"version=$version"
override fun toString() = "$kind " + (if (isLocalClass) "(local) " else "") + "version=$version"
}
fun KotlinClassHeader.isCompatibleClassKind(): Boolean = version.isCompatible() && kind == KotlinClassHeader.Kind.CLASS
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java
+2 -27
View File
@@ -51,7 +51,6 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor
private String[] annotationData = null;
private String[] strings = null;
private KotlinClassHeader.Kind headerKind = null;
private String syntheticClassKind = null;
private boolean isInterfaceDefaultImpls = false;
private boolean isLocalClass = false;
@@ -71,8 +70,7 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor
}
return new KotlinClassHeader(
headerKind, version, annotationData, strings, syntheticClassKind, filePartClassNames, multifileClassName,
isInterfaceDefaultImpls, isLocalClass
headerKind, version, annotationData, strings, filePartClassNames, multifileClassName, isInterfaceDefaultImpls, isLocalClass
);
}
@@ -103,18 +101,7 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor
KotlinClassHeader.Kind newKind = HEADER_KINDS.get(classId);
if (newKind != null) {
headerKind = newKind;
switch (newKind) {
case CLASS:
case FILE_FACADE:
case MULTIFILE_CLASS:
case MULTIFILE_CLASS_PART:
return new HeaderAnnotationArgumentVisitor();
case SYNTHETIC_CLASS:
return new SyntheticClassHeaderReader();
default:
return null;
}
return new HeaderAnnotationArgumentVisitor();
}
return null;
@@ -227,16 +214,4 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor
protected abstract void visitEnd(@NotNull String[] data);
}
}
private class SyntheticClassHeaderReader extends HeaderAnnotationArgumentVisitor {
@Override
public void visitEnum(@NotNull Name name, @NotNull ClassId enumClassId, @NotNull Name enumEntryName) {
if ("Kind".equals(enumClassId.getShortClassName().asString()) &&
enumClassId.isNestedClass() &&
enumClassId.getOuterClassId().equals(ClassId.topLevel(KOTLIN_SYNTHETIC_CLASS)) &&
"kind".equals(name.asString())) {
syntheticClassKind = enumEntryName.asString();
}
}
}
}