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

Drop 'OBJECT$' field deprecated in M11

Browse Source
This commit is contained in:
Alexander Udalov
2015-06-26 21:55:13 +03:00
parent 0bad4e0137
commit feb4dd7b8f
23 changed files with 3 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
Vendored
-5
View File
@@ -3,11 +3,6 @@ public final class ClassObjectField {
public static final java.lang.String x = "";
private static final java.lang.String y = "";
public static final ClassObjectField.Companion Companion;
/**
* @deprecated
*/
@java.lang.Deprecated
public static final ClassObjectField.Companion OBJECT$;
public ClassObjectField() { /* compiled code */ }
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
Vendored
-5
View File
@@ -1,10 +1,5 @@
public interface TraitClassObjectField {
TraitClassObjectField.Companion Companion;
/**
* @deprecated
*/
@java.lang.Deprecated
TraitClassObjectField.Companion OBJECT$;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
compiler/testData/codegen/boxWithJava/classObjectAccessor/J.java
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public class J {
public static int f() {
return A.Companion.getI1() + A.OBJECT$.getI2() + B.Named.getI1() + B.OBJECT$.getI2();
return A.Companion.getI1() + A.Companion.getI2() + B.Named.getI1() + B.Named.getI2();
}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
Vendored
-6
View File
@@ -3,9 +3,3 @@ class C {
val <!REDECLARATION!>Companion<!> = C
}
class D {
companion <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
Vendored
-15
View File
@@ -14,18 +14,3 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
Vendored
-8
View File
@@ -11,11 +11,3 @@ class C {
}
}
class D {
companion <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
val `OBJECT$` = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
Vendored
-16
View File
@@ -29,19 +29,3 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public companion object Companion {
private constructor Companion()
internal final val `OBJECT$`: D.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}