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

Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-26 00:21:05 +04:00
parent 549a38ca6f
commit de0f751207
110 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
+1 -1
View File
@@ -2,7 +2,7 @@ public final class ClassObjectField implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public static final java.lang.String x = "";
private static final java.lang.String y = "";
public static final ClassObjectField.object object$;
public static final ClassObjectField.object OBJECT$;
public ClassObjectField() { /* compiled code */ }
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
+1 -1
View File
@@ -1,5 +1,5 @@
public interface TraitClassObjectField extends kotlin.jvm.internal.KObject {
TraitClassObjectField.object object$;
TraitClassObjectField.object OBJECT$;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
+9 -9
View File
@@ -2,18 +2,18 @@ package test;
class ClassObject {
void accessToClassObject() {
WithClassObject.object$.foo();
WithClassObject.object$.getValue();
WithClassObject.object$.getValueWithGetter();
WithClassObject.object$.getVariable();
WithClassObject.object$.setVariable(0);
WithClassObject.object$.getVariableWithAccessors();
WithClassObject.object$.setVariableWithAccessors(0);
WithClassObject.OBJECT$.foo();
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.getValueWithGetter();
WithClassObject.OBJECT$.getVariable();
WithClassObject.OBJECT$.setVariable(0);
WithClassObject.OBJECT$.getVariableWithAccessors();
WithClassObject.OBJECT$.setVariableWithAccessors(0);
}
void accessToPackageObject() {
PackageInner.instance$.foo();
PackageInner.instance$.getValue();
PackageInner.INSTANCE$.foo();
PackageInner.INSTANCE$.getValue();
}
void accessToInnerClass() {
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = C
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = C
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class C {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = this
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
val `object$` = C
val `OBJECT$` = C
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt
+1 -1
View File
@@ -1,3 +1,3 @@
object <!CONFLICTING_JVM_DECLARATIONS!>O<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `instance$`: O<!> = null!!
<!CONFLICTING_JVM_DECLARATIONS!>val `INSTANCE$`: O<!> = null!!
}