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

Class resolution simplified (effectively dead code eliminated)

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-17 14:07:06 +04:00
committed by Alexander Udalov
parent 930217c877
commit bb27d5c283
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java
+1 -19
View File
@@ -54,25 +54,7 @@ public class NameResolver {
ProtoBuf.QualifiedNameTable.QualifiedName fqNameProto = qualifiedNames.getQualifiedNames(fqNameIndex); ProtoBuf.QualifiedNameTable.QualifiedName fqNameProto = qualifiedNames.getQualifiedNames(fqNameIndex);
assert fqNameProto.getKind() == ProtoBuf.QualifiedNameTable.QualifiedName.Kind.CLASS : "Not a class fqName: " + getFqName(fqNameIndex); assert fqNameProto.getKind() == ProtoBuf.QualifiedNameTable.QualifiedName.Kind.CLASS : "Not a class fqName: " + getFqName(fqNameIndex);
if (fqNameProto.hasParentQualifiedName()) { return classResolver.findClass(getFqName(fqNameIndex));
int parentFqNameIndex = fqNameProto.getParentQualifiedName();
ProtoBuf.QualifiedNameTable.QualifiedName parentFqNameProto = qualifiedNames.getQualifiedNames(parentFqNameIndex);
switch (fqNameProto.getKind()) {
case CLASS:
return classResolver.findClass(getFqName(fqNameIndex));
case PACKAGE:
Name name = getName(fqNameProto.getShortName());
ClassDescriptor outerClass = getClassDescriptor(parentFqNameIndex);
if (outerClass == null) return null;
return (ClassDescriptor) outerClass.getUnsubstitutedInnerClassesScope().getClassifier(name);
}
throw new IllegalStateException("Unknown kind: " + fqNameProto);
}
else {
FqName fqName = FqName.topLevel(getName(fqNameProto.getShortName()));
return classResolver.findClass(fqName);
}
} }
@NotNull @NotNull