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

Renamed ClassObject$ to object in JVM backend.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-10-26 21:19:55 +04:00
parent 58b904adb9
commit c84cd7f961
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class JvmAbi {
public static final String SETTER_PREFIX = "set"; public static final String SETTER_PREFIX = "set";
public static final String PACKAGE_CLASS = "namespace"; public static final String PACKAGE_CLASS = "namespace";
public static final String CLASS_OBJECT_CLASS_NAME = "ClassObject$"; public static final String CLASS_OBJECT_CLASS_NAME = "object";
public static final String CLASS_OBJECT_SUFFIX = "$" + CLASS_OBJECT_CLASS_NAME; public static final String CLASS_OBJECT_SUFFIX = "$" + CLASS_OBJECT_CLASS_NAME;
public static final String INSTANCE_FIELD = "$instance"; public static final String INSTANCE_FIELD = "$instance";
compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt
+1 -1
View File
@@ -5,5 +5,5 @@ class MyClass {
} }
// TESTED_OBJECT_KIND: class // TESTED_OBJECT_KIND: class
// TESTED_OBJECTS: MyClass$ClassObject$ // TESTED_OBJECTS: MyClass$object
// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED, ACC_SUPER // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED, ACC_SUPER
compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt
+1 -1
View File
@@ -5,5 +5,5 @@ class MyClass() {
} }
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass$ClassObject$, test // TESTED_OBJECTS: MyClass$object, test
// FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL
idea/testData/debugger/classObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class A { class A {
class object { class object {
fun foo() { fun foo() {
"" // A$ClassObject$ "" // A$object
} }
} }
} }
idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
+3 -3
View File
@@ -127,14 +127,14 @@ public class JetJavaFacadeTest extends LightCodeInsightFixtureTestCase {
PsiField classobjField = theClass.findFieldByName("$classobj", false); PsiField classobjField = theClass.findFieldByName("$classobj", false);
assertNull(classobjField); assertNull(classobjField);
final PsiClass classObjectClass = theClass.findInnerClassByName("ClassObject$", false); final PsiClass classObjectClass = theClass.findInnerClassByName("object", false);
assertNotNull(classObjectClass); assertNotNull(classObjectClass);
assertEquals("foo.TheClass.ClassObject$", classObjectClass.getQualifiedName()); assertEquals("foo.TheClass.object", classObjectClass.getQualifiedName());
assertTrue(classObjectClass.hasModifierProperty(PsiModifier.STATIC)); assertTrue(classObjectClass.hasModifierProperty(PsiModifier.STATIC));
final PsiField instance = classObjectClass.findFieldByName(JvmAbi.INSTANCE_FIELD, false); final PsiField instance = classObjectClass.findFieldByName(JvmAbi.INSTANCE_FIELD, false);
assertNotNull(instance); assertNotNull(instance);
assertEquals("foo.TheClass.ClassObject$", instance.getType().getCanonicalText()); assertEquals("foo.TheClass.object", instance.getType().getCanonicalText());
assertTrue(instance.hasModifierProperty(PsiModifier.PUBLIC)); assertTrue(instance.hasModifierProperty(PsiModifier.PUBLIC));
assertTrue(instance.hasModifierProperty(PsiModifier.STATIC)); assertTrue(instance.hasModifierProperty(PsiModifier.STATIC));
assertTrue(instance.hasModifierProperty(PsiModifier.FINAL)); assertTrue(instance.hasModifierProperty(PsiModifier.FINAL));