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

Using FqNameUnsafe for relative class names

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-22 16:44:28 +04:00
committed by Alexander Udalov
parent 699d5acd36
commit 347e2c27aa
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
+6 -5
View File
@@ -2,13 +2,14 @@ package org.jetbrains.jet.descriptors.serialization;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
public final class ClassId {
private final FqName packageFqName;
private final FqName relativeClassName;
private final FqNameUnsafe relativeClassName;
public ClassId(@NotNull FqName packageFqName, @NotNull FqName relativeClassName) {
public ClassId(@NotNull FqName packageFqName, @NotNull FqNameUnsafe relativeClassName) {
this.packageFqName = packageFqName;
assert !relativeClassName.isRoot() : "Class name must not be root. " + packageFqName;
this.relativeClassName = relativeClassName;
@@ -20,7 +21,7 @@ public final class ClassId {
}
@NotNull
public FqName getRelativeClassName() {
public FqNameUnsafe getRelativeClassName() {
return relativeClassName;
}
@@ -29,9 +30,9 @@ public final class ClassId {
return new ClassId(getPackageFqName(), relativeClassName.child(name));
}
public FqName asSingleFqName() {
public FqNameUnsafe asSingleFqName() {
if (packageFqName.isRoot()) return relativeClassName;
return new FqName(packageFqName.getFqName() + "." + relativeClassName.getFqName());
return new FqNameUnsafe(packageFqName.getFqName() + "." + relativeClassName.getFqName());
}
@Override
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.*;
@@ -80,7 +81,7 @@ public class NameResolver {
packageFqName = FqName.ROOT;
}
return new ClassId(packageFqName, new FqName(relativeClassName.toString()));
return new ClassId(packageFqName, new FqNameUnsafe(relativeClassName.toString()));
}
@Nullable