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

Excluded class object names from FQ name and qualified name.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-28 11:37:02 +04:00
parent c041fc8fea
commit dda15f7505
8 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+6
View File
@@ -127,6 +127,12 @@ public class DescriptorUtils {
throw new IllegalStateException("descriptor is not module descriptor and has null containingDeclaration: " + containingDeclaration); throw new IllegalStateException("descriptor is not module descriptor and has null containingDeclaration: " + containingDeclaration);
} }
if (containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.CLASS_OBJECT) {
DeclarationDescriptor classOfClassObject = containingDeclaration.getContainingDeclaration();
assert classOfClassObject != null;
return getFQName(classOfClassObject).child(descriptor.getName());
}
return getFQName(containingDeclaration).child(descriptor.getName()); return getFQName(containingDeclaration).child(descriptor.getName());
} }
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+3 -1
View File
@@ -176,7 +176,9 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
// for nested classes qualified name should be used // for nested classes qualified name should be used
DeclarationDescriptor current = klass; DeclarationDescriptor current = klass;
do { do {
qualifiedNameElements.add(current.getName()); if (((ClassDescriptor) current).getKind() != ClassKind.CLASS_OBJECT) {
qualifiedNameElements.add(current.getName());
}
current = current.getContainingDeclaration(); current = current.getContainingDeclaration();
} }
while (current instanceof ClassDescriptor); while (current instanceof ClassDescriptor);
compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
+1 -1
View File
@@ -5,7 +5,7 @@ public final class Outer {
public class object <class-object-for-Outer> { public class object <class-object-for-Outer> {
/*primary*/ private constructor <class-object-for-Outer>() /*primary*/ private constructor <class-object-for-Outer>()
public final val Obj : test.Outer.<class-object-for-Outer>.Obj public final val Obj : test.Outer.Obj
public object Obj { public object Obj {
/*primary*/ private constructor Obj() /*primary*/ private constructor Obj()
compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
+4 -4
View File
@@ -6,16 +6,16 @@ internal final class A {
internal class object <class-object-for-A> { internal class object <class-object-for-A> {
private constructor <class-object-for-A>() private constructor <class-object-for-A>()
internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> { internal final enum class E : jet.Enum<test.A.E> {
private constructor E() private constructor E()
public final override /*1*/ /*fake_override*/ fun name() : jet.String public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
private constructor <class-object-for-E>() private constructor <class-object-for-E>()
public final val ENTRY : test.A.<class-object-for-A>.E public final val ENTRY : test.A.E
public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E public final fun valueOf(/*0*/ value : jet.String) : test.A.E
public final fun values() : jet.Array<test.A.<class-object-for-A>.E> public final fun values() : jet.Array<test.A.E>
} }
} }
} }
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
+4 -4
View File
@@ -6,16 +6,16 @@ internal final class A {
internal class object <class-object-for-A> { internal class object <class-object-for-A> {
private constructor <class-object-for-A>() private constructor <class-object-for-A>()
internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> { internal final enum class E : jet.Enum<test.A.E> {
private constructor E() private constructor E()
public final override /*1*/ /*fake_override*/ fun name() : jet.String public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
private constructor <class-object-for-E>() private constructor <class-object-for-E>()
public final val ENTRY : test.A.<class-object-for-A>.E public final val ENTRY : test.A.E
public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E public final fun valueOf(/*0*/ value : jet.String) : test.A.E
public final fun values() : jet.Array<test.A.<class-object-for-A>.E> public final fun values() : jet.Array<test.A.E>
} }
} }
} }
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt
+5 -5
View File
@@ -6,18 +6,18 @@ internal final class A {
internal class object <class-object-for-A> { internal class object <class-object-for-A> {
/*primary*/ private constructor <class-object-for-A>() /*primary*/ private constructor <class-object-for-A>()
internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> { internal final enum class E : jet.Enum<test.A.E> {
/*primary*/ private constructor E() /*primary*/ private constructor E()
public final override /*1*/ /*fake_override*/ fun name() : jet.String public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>() /*primary*/ private constructor <class-object-for-E>()
public final val ENTRY : test.A.<class-object-for-A>.E public final val ENTRY : test.A.E
public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E public final fun valueOf(/*0*/ value : jet.String) : test.A.E
public final fun values() : jet.Array<test.A.<class-object-for-A>.E> public final fun values() : jet.Array<test.A.E>
private enum entry ENTRY : test.A.<class-object-for-A>.E { private enum entry ENTRY : test.A.E {
/*primary*/ private constructor ENTRY() /*primary*/ private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun name() : jet.String public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt
+5 -5
View File
@@ -6,18 +6,18 @@ internal final class A {
public class object <class-object-for-A> { public class object <class-object-for-A> {
/*primary*/ private constructor <class-object-for-A>() /*primary*/ private constructor <class-object-for-A>()
internal final enum class E : jet.Enum<test.A.<class-object-for-A>.E> { internal final enum class E : jet.Enum<test.A.E> {
/*primary*/ private constructor E() /*primary*/ private constructor E()
public final override /*1*/ /*fake_override*/ fun name() : jet.String public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
internal class object <class-object-for-E> { internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>() /*primary*/ private constructor <class-object-for-E>()
public final val ENTRY : test.A.<class-object-for-A>.E public final val ENTRY : test.A.E
public final fun valueOf(/*0*/ value : jet.String) : test.A.<class-object-for-A>.E public final fun valueOf(/*0*/ value : jet.String) : test.A.E
public final fun values() : jet.Array<test.A.<class-object-for-A>.E> public final fun values() : jet.Array<test.A.E>
private enum entry ENTRY : test.A.<class-object-for-A>.E { private enum entry ENTRY : test.A.E {
/*primary*/ private constructor ENTRY() /*primary*/ private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun name() : jet.String public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
compiler/testData/renderer/Enum.kt
+1 -1
View File
@@ -9,5 +9,5 @@ private enum class TheEnum(val rgb : Int) {
//private constructor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum //private constructor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum
//value-parameter val rgb : jet.Int defined in rendererTest.TheEnum.<init> //value-parameter val rgb : jet.Int defined in rendererTest.TheEnum.<init>
//private enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum> //private enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
//private constructor VAL1() defined in rendererTest.TheEnum.<class-object-for-TheEnum>.VAL1 //private constructor VAL1() defined in rendererTest.TheEnum.VAL1
//public final val VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum> //public final val VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>