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

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/MultipleBounds.kt
+2 -2
View File
@@ -17,7 +17,7 @@ trait G<X> {
class C() : A(), B
class D() {
default object : A(), B {}
companion object : A(), B {}
}
class Test1<T : A>()
@@ -72,7 +72,7 @@ val t3 = test2<C>(C())
class Test<T>
where
<!UNSUPPORTED!>class object T : <!FINAL_DEFAULT_OBJECT_UPPER_BOUND!>Foo<!><!>,
<!UNSUPPORTED!>class object T : <!FINAL_COMPANION_OBJECT_UPPER_BOUND!>Foo<!><!>,
<!UNSUPPORTED!>class object T : A<!> {}
val <T, B : T> x : Int = 0
compiler/testData/diagnostics/tests/MultipleBounds.txt
+2 -2
View File
@@ -52,8 +52,8 @@ package Jet87 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : Jet87.A, Jet87.B {
private constructor Default()
internal companion object Companion : Jet87.A, Jet87.B {
private constructor Companion()
internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.Double
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
+14 -14
View File
@@ -3,24 +3,24 @@ package foo
class X {}
val s = <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>java<!>
val ss = <!NO_DEFAULT_OBJECT!>System<!>
val sss = <!NO_DEFAULT_OBJECT!>X<!>
val x = "${<!NO_DEFAULT_OBJECT!>System<!>}"
val ss = <!NO_COMPANION_OBJECT!>System<!>
val sss = <!NO_COMPANION_OBJECT!>X<!>
val x = "${<!NO_COMPANION_OBJECT!>System<!>}"
val xs = java.<!EXPRESSION_EXPECTED_PACKAGE_FOUND!>lang<!>
val xss = java.lang.<!NO_DEFAULT_OBJECT!>System<!>
val xsss = foo.<!NO_DEFAULT_OBJECT!>X<!>
val xss = java.lang.<!NO_COMPANION_OBJECT!>System<!>
val xsss = foo.<!NO_COMPANION_OBJECT!>X<!>
val xssss = <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>foo<!>
val f = { <!NO_DEFAULT_OBJECT!>System<!> }
val f = { <!NO_COMPANION_OBJECT!>System<!> }
fun main(args : Array<String>) {
<!EXPRESSION_EXPECTED_PACKAGE_FOUND!>java<!> = null
<!NO_DEFAULT_OBJECT!>System<!> = null
<!NO_DEFAULT_OBJECT!>System<!>!!
java.lang.<!NO_DEFAULT_OBJECT!>System<!> = null
java.lang.<!NO_DEFAULT_OBJECT!>System<!>!!
<!NO_DEFAULT_OBJECT!>System<!> is Int
<!NO_COMPANION_OBJECT!>System<!> = null
<!NO_COMPANION_OBJECT!>System<!>!!
java.lang.<!NO_COMPANION_OBJECT!>System<!> = null
java.lang.<!NO_COMPANION_OBJECT!>System<!>!!
<!NO_COMPANION_OBJECT!>System<!> is Int
<!INVISIBLE_MEMBER!>System<!>()
(<!NO_DEFAULT_OBJECT!>System<!>)
@foo <!NO_DEFAULT_OBJECT!>System<!>
null in <!NO_DEFAULT_OBJECT!>System<!>
(<!NO_COMPANION_OBJECT!>System<!>)
@foo <!NO_COMPANION_OBJECT!>System<!>
null in <!NO_COMPANION_OBJECT!>System<!>
}
compiler/testData/diagnostics/tests/annotations/annotationModifier.kt
+1 -1
View File
@@ -1,7 +1,7 @@
annotation class B
class A {
<!ILLEGAL_ANNOTATION_KEYWORD!>annotation<!> default object {}
<!ILLEGAL_ANNOTATION_KEYWORD!>annotation<!> companion object {}
}
<!ILLEGAL_ANNOTATION_KEYWORD!>annotation<!> object O {}
compiler/testData/diagnostics/tests/annotations/annotationModifier.txt
+2 -2
View File
@@ -10,8 +10,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/annotations/kt1886annotationBody.kt
+1 -1
View File
@@ -11,7 +11,7 @@ annotation class Annotation4() <!ANNOTATION_CLASS_WITH_BODY!>{
}<!>
annotation class Annotation5() <!ANNOTATION_CLASS_WITH_BODY!>{
default object {}
companion object {}
}<!>
annotation class Annotation6() <!ANNOTATION_CLASS_WITH_BODY!>{
compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt
+2 -2
View File
@@ -50,8 +50,8 @@ internal final annotation class Annotation5 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/cast/WhenWithExpression.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class List<out T>(val size : Int) {
default object {
companion object {
val Nil = List<Nothing>(0)
}
}
compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt
+2 -2
View File
@@ -9,8 +9,8 @@ internal final class List</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val Nil: List<kotlin.Nothing>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt
+1 -1
View File
@@ -3,7 +3,7 @@
class A() {
val x = 1
default object {
companion object {
val y = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>x<!>
}
}
compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt
+2 -2
View File
@@ -7,8 +7,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val y: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
+4 -4
View File
@@ -2,14 +2,14 @@ package foo
fun test() {
A.d
A.Default.<!INVISIBLE_MEMBER!>f<!>
A.Companion.<!INVISIBLE_MEMBER!>f<!>
B.<!INVISIBLE_MEMBER!>D<!>
<!INVISIBLE_MEMBER!>CCC<!>
CCC.<!INVISIBLE_MEMBER!>classObjectVar<!>
}
class A() {
public default object {
public companion object {
val d = 3
private object f {
@@ -19,12 +19,12 @@ class A() {
class B {
class D {
private default object
private companion object
}
}
class CCC() {
private default object {
private companion object {
val classObjectVar = 3
}
}
compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt
+6 -6
View File
@@ -9,8 +9,8 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
internal final val d: kotlin.Int = 3
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -37,8 +37,8 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private 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
@@ -52,8 +52,8 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private companion object Companion {
private constructor Companion()
internal final val classObjectVar: kotlin.Int = 3
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
+7 -7
View File
@@ -1,22 +1,22 @@
package Jet86
class A {
default <!REDECLARATION!>object<!> {
companion <!REDECLARATION!>object<!> {
val x = 1
}
<!MANY_DEFAULT_OBJECTS!>default<!> <!REDECLARATION!>object<!> {
<!MANY_COMPANION_OBJECTS!>companion<!> <!REDECLARATION!>object<!> {
val x = 1
}
}
class AA {
default object {
companion object {
val x = 1
}
<!MANY_DEFAULT_OBJECTS!>default<!> object A {
<!MANY_COMPANION_OBJECTS!>companion<!> object A {
val x = 1
}
<!MANY_DEFAULT_OBJECTS!>default<!> object AA {
<!MANY_COMPANION_OBJECTS!>companion<!> object AA {
val x = 1
}
}
@@ -26,7 +26,7 @@ class B() {
}
object b {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {
val x = 1
} // error
}
@@ -35,7 +35,7 @@ val a = A.x
val c = B.<!UNRESOLVED_REFERENCE!>x<!>
val d = b.<!UNRESOLVED_REFERENCE!>x<!>
val s = <!NO_DEFAULT_OBJECT!>System<!> // error
val s = <!NO_COMPANION_OBJECT!>System<!> // error
fun test() {
System.out.println()
java.lang.System.out.println()
compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt
+10 -10
View File
@@ -13,16 +13,16 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int = 1
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
}
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -36,7 +36,7 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -44,7 +44,7 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object AA {
internal companion object AA {
private constructor AA()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -52,8 +52,8 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -75,8 +75,8 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt
+10 -10
View File
@@ -5,7 +5,7 @@ class A {
inner class Inner
default object {
companion object {
class Nested2
@@ -28,20 +28,20 @@ object O {
fun f() {
A.c
A.hashCode()
A().<!NO_DEFAULT_OBJECT, NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE!>Nested<!>
A().<!NO_COMPANION_OBJECT, NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE!>Nested<!>
A.Nested()
A().Inner()
A.Default.<!UNRESOLVED_REFERENCE!>Nested<!>
A.Default.<!UNRESOLVED_REFERENCE!>Inner<!>
A.Companion.<!UNRESOLVED_REFERENCE!>Nested<!>
A.Companion.<!UNRESOLVED_REFERENCE!>Inner<!>
A.<!UNRESOLVED_REFERENCE!>Inner<!>
A.Default.c
A.Default.Obj2
A.Default.Obj2.c
A.Companion.c
A.Companion.Obj2
A.Companion.Obj2.c
A.Default.Nested2()
A.Default.c
A.Companion.Nested2()
A.Companion.c
A.Obj
A.Default.Obj2
A.Companion.Obj2
A.<!UNRESOLVED_REFERENCE!>Obj2<!>
A.<!UNRESOLVED_REFERENCE!>Obj2<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>c<!>
A.<!UNRESOLVED_REFERENCE!>Nested2<!>
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt
+2 -2
View File
@@ -9,8 +9,8 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val c: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt
+5 -5
View File
@@ -2,16 +2,16 @@
class A {
inner class B {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object { }
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object { }
}
}
class B {
default object {
companion object {
class B {
default object {
companion object {
class C {
default object { }
companion object { }
}
}
}
@@ -20,6 +20,6 @@ class B {
class C {
class D {
default object { }
companion object { }
}
}
compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt
+10 -10
View File
@@ -12,8 +12,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -27,8 +27,8 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -39,8 +39,8 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -51,8 +51,8 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -75,8 +75,8 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/classObjects/classObjectHeader.kt
+1 -1
View File
@@ -4,6 +4,6 @@ open class ToResolve<SomeClass>(<!UNUSED_PARAMETER!>f<!> : (Int) -> Int)
fun testFun(<!UNUSED_PARAMETER!>a<!> : Int) = 12
class TestSome<P> {
default object : ToResolve<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>({testFun(it)}) {
companion object : ToResolve<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>({testFun(it)}) {
}
}
compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt
+2 -2
View File
@@ -9,8 +9,8 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : test.ToResolve<P> {
private constructor Default()
internal companion object Companion : test.ToResolve<P> {
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/classObjects/classObjectInLocalClass.kt
+2 -2
View File
@@ -1,9 +1,9 @@
fun test() {
class A {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object {}
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {}
}
object {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object {}
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {}
}
}
compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt
+4 -4
View File
@@ -1,13 +1,13 @@
package test
class A {
object <!REDECLARATION!>Default<!>
object <!REDECLARATION!>Companion<!>
default <!REDECLARATION!>object<!>
companion <!REDECLARATION!>object<!>
}
class B {
default object <!REDECLARATION!>Named<!>
companion object <!REDECLARATION!>Named<!>
object <!REDECLARATION!>Named<!>
}
@@ -15,5 +15,5 @@ class B {
class C {
class <!REDECLARATION!>Named<!>
default object <!REDECLARATION!>Named<!>
companion object <!REDECLARATION!>Named<!>
}
compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt
+6 -6
View File
@@ -8,15 +8,15 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal object Default {
private constructor Default()
internal 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
}
internal default object Default {
private constructor Default()
internal 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
@@ -36,7 +36,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object Named {
internal companion object Named {
private constructor Named()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -57,7 +57,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object Named {
internal companion object Named {
private constructor Named()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.kt
+2 -2
View File
@@ -13,13 +13,13 @@ trait B {
}
class C {
default <!DEPRECATED_CLASS_OBJECT_SYNTAX!>class object<!>
companion <!DEPRECATED_CLASS_OBJECT_SYNTAX!>class object<!>
}
fun main() {
A
A.A
g(B.Default)
g(B.Companion)
g(B)
A.ext()
compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.txt
+5 -5
View File
@@ -10,7 +10,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,8 +23,8 @@ internal trait B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : G {
private constructor Default()
internal companion object Companion : G {
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
@@ -37,8 +37,8 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/classObjects/importClassInClassObject.kt
+2 -2
View File
@@ -1,9 +1,9 @@
package f
import f.A.Default.B
import f.A.Companion.B
class A {
default object {
companion object {
class B
}
}
compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package
package f {
internal fun test(): f.A.Default.B
internal fun test(): f.A.Companion.B
internal final class A {
public constructor A()
@@ -9,8 +9,8 @@ package f {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/classObjects/invisibleClassObjects.kt
+4 -4
View File
@@ -2,25 +2,25 @@
package a
class A {
default object {
companion object {
fun foo() {}
}
}
private class B {
default object {
companion object {
fun bar() {}
}
}
class C {
private default object {
private companion object {
fun baz() {}
}
}
private class D {
private default object {
private companion object {
fun quux() {}
}
}
compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt
+8 -8
View File
@@ -8,8 +8,8 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,8 +23,8 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private companion object Companion {
private constructor Companion()
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -38,8 +38,8 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private companion object Companion {
private constructor Companion()
internal final fun baz(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,8 +53,8 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private 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
internal final fun quux(): kotlin.Unit
compiler/testData/diagnostics/tests/classObjects/kt3866.kt
+2 -2
View File
@@ -4,11 +4,11 @@ open class C {
fun C.foo() {}
open class X {
default object : C() {}
companion object : C() {}
}
open class Y {
default object : C() {}
companion object : C() {}
}
fun bar() {
compiler/testData/diagnostics/tests/classObjects/kt3866.txt
+4 -4
View File
@@ -16,8 +16,8 @@ internal open class X {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : C {
private constructor Default()
internal companion object Companion : C {
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
@@ -30,8 +30,8 @@ internal open class Y {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : C {
private constructor Default()
internal companion object Companion : C {
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/classObjects/multipleDissallowedDefaultObjects.kt
+6 -6
View File
@@ -1,17 +1,17 @@
class A {
inner class I {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object A
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object A
<!MANY_DEFAULT_OBJECTS, DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object B
<!MANY_COMPANION_OBJECTS, COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object B
<!MANY_DEFAULT_OBJECTS, DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object C
<!MANY_COMPANION_OBJECTS, COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object C
}
}
object O {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object A
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object A
<!MANY_DEFAULT_OBJECTS, DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object B
<!MANY_COMPANION_OBJECTS, COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object B
<!MANY_DEFAULT_OBJECTS, DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object C
<!MANY_COMPANION_OBJECTS, COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object C
}
compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt
+6 -6
View File
@@ -12,21 +12,21 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
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
}
internal default object B {
internal companion object B {
private constructor B()
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
}
internal default object C {
internal companion object C {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -41,21 +41,21 @@ internal object O {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
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
}
internal default object B {
internal companion object B {
private constructor B()
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
}
internal default object C {
internal companion object C {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
+4 -4
View File
@@ -1,8 +1,8 @@
class A {
private default object {
private companion object {
class B {
class C {
default object {
companion object {
fun foo() {}
}
}
@@ -10,6 +10,6 @@ class A {
}
}
fun f1() = A.Default.B.<!INVISIBLE_MEMBER!>C<!>
fun f1() = A.Companion.B.<!INVISIBLE_MEMBER!>C<!>
fun f2() = A.Default.B.C.<!INVISIBLE_MEMBER!>foo<!>()
fun f2() = A.Companion.B.C.<!INVISIBLE_MEMBER!>foo<!>()
compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt
+5 -5
View File
@@ -1,6 +1,6 @@
package
internal fun f1(): A.Default.B.C.Default
internal fun f1(): A.Companion.B.C.Companion
internal fun f2(): kotlin.Unit
internal final class A {
@@ -9,8 +9,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private 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
@@ -27,8 +27,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
class Test {
fun test(): Int = 12
default object {
companion object {
val a = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>test()<!> // Check if resolver will be able to infer type of a variable
}
}
compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt
+2 -2
View File
@@ -9,8 +9,8 @@ package test {
internal final fun test(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val a: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
+1 -1
View File
@@ -247,7 +247,7 @@ class ForwardAccessToBackingField() { //kt-147
}
class ClassObject() {
default object {
companion object {
val x : Int
init {
compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
+2 -2
View File
@@ -49,8 +49,8 @@ package uninitialized_reassigned_variables {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt
+1 -1
View File
@@ -10,7 +10,7 @@ enum class Direction {
}
class A {
default object {
companion object {
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
+2 -2
View File
@@ -12,8 +12,8 @@ package kt1185 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt
+1 -1
View File
@@ -13,7 +13,7 @@ object Obj {
}
class AClass() {
default object {
companion object {
val y : Any? = 2
}
}
compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt
+2 -2
View File
@@ -11,8 +11,8 @@ package example {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val y: kotlin.Any? = 2
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
+5 -5
View File
@@ -1,12 +1,12 @@
// !DIAGNOSTICS: -MANY_DEFAULT_OBJECTS -REDECLARATION
// !DIAGNOSTICS: -MANY_COMPANION_OBJECTS -REDECLARATION
// KT-3464 Front-end shouldn't allow override modifier in class declaration
<!ILLEGAL_MODIFIER!>override<!> class A {
<!ILLEGAL_MODIFIER!>override<!> default object {}
<!ILLEGAL_MODIFIER!>open<!> default object {}
<!ILLEGAL_MODIFIER!>abstract<!> default object {}
<!ILLEGAL_MODIFIER!>final<!> default object {}
<!ILLEGAL_MODIFIER!>override<!> companion object {}
<!ILLEGAL_MODIFIER!>open<!> companion object {}
<!ILLEGAL_MODIFIER!>abstract<!> companion object {}
<!ILLEGAL_MODIFIER!>final<!> companion object {}
}
<!ILLEGAL_MODIFIER!>override<!> object B1 {}
compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+8 -8
View File
@@ -6,29 +6,29 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
}
internal default object Default {
private constructor Default()
internal 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
}
internal default object Default {
private constructor Default()
internal 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
}
internal default object Default {
private constructor Default()
internal 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/functionAndProperty/classObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun getX(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+3 -3
View File
@@ -1,11 +1,11 @@
class C {
default <!REDECLARATION!>object<!> {}
companion <!REDECLARATION!>object<!> {}
val <!REDECLARATION!>Default<!> = C
val <!REDECLARATION!>Companion<!> = C
}
class D {
default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
companion <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
+6 -6
View File
@@ -2,13 +2,13 @@ package
internal final class C {
public constructor C()
internal final val Default: C.Default
internal final val Companion: C.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
internal default object Default {
private constructor Default()
internal 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
@@ -17,13 +17,13 @@ internal final class C {
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.Default
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
internal default object Default {
private constructor Default()
internal 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/classObjectCopiedField.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
val X = 1
<!CONFLICTING_JVM_DECLARATIONS!>val `X$1`<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt
+2 -2
View File
@@ -7,8 +7,8 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val X: kotlin.Int = 1
internal final val `X$1`: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+3 -3
View File
@@ -1,19 +1,19 @@
class B {
default object <!REDECLARATION!>A<!> {
companion object <!REDECLARATION!>A<!> {
}
val <!REDECLARATION!>A<!> = this
}
class C {
default <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
companion <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val A<!> = this
}
}
class D {
default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
companion <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
+6 -6
View File
@@ -7,7 +7,7 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,7 +21,7 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
internal final val A: C.A
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -32,14 +32,14 @@ internal final class C {
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.Default
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
internal default object Default {
private constructor Default()
internal final val `OBJECT$`: D.Default
internal 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
compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
default object {
companion object {
fun entry() = ENTRY
}
}
compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+2 -2
View File
@@ -21,8 +21,8 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final fun entry(): E
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
private default object
private companion object
}
fun foo() = E.values()
compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+3 -3
View File
@@ -3,7 +3,7 @@ package
internal fun bar(): E
internal fun baz(): E
internal fun foo(): kotlin.Array<E>
internal fun quux(): E.Default
internal fun quux(): E.Companion
internal final enum class E : kotlin.Enum<E> {
public enum entry ENTRY : E {
@@ -24,8 +24,8 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private 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/enum/enumEntryCannotHaveClassObject.kt
+1 -1
View File
@@ -2,7 +2,7 @@ enum class E {
FIRST
SECOND {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+2 -2
View File
@@ -22,8 +22,8 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/enum/enumModifier.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class B {}
class A {
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> default object {}
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> companion object {}
}
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> object O {}
compiler/testData/diagnostics/tests/enum/enumModifier.txt
+2 -2
View File
@@ -10,8 +10,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/enum/inner/existingClassObject.kt
+2 -2
View File
@@ -3,14 +3,14 @@ class A {
ENTRY
}
default object {
companion object {
}
}
class B {
default object {
companion object {
}
enum class E {
compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+4 -4
View File
@@ -6,8 +6,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -44,8 +44,8 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/enum/inner/insideClassObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
enum class E {
ENTRY
}
compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+8 -8
View File
@@ -6,16 +6,16 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
internal final enum class E : kotlin.Enum<A.Default.E> {
public enum entry ENTRY : A.Default.E {
internal final enum class E : kotlin.Enum<A.Companion.E> {
public enum entry ENTRY : A.Companion.E {
private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -24,7 +24,7 @@ internal final class A {
}
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -32,8 +32,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Default.E>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
}
}
}
compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
ENTRY
}
default object {
companion object {
enum class E {
ENTRY2
}
compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+8 -8
View File
@@ -6,16 +6,16 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
internal final enum class E : kotlin.Enum<A.Default.E> {
public enum entry ENTRY2 : A.Default.E {
internal final enum class E : kotlin.Enum<A.Companion.E> {
public enum entry ENTRY2 : A.Companion.E {
private constructor ENTRY2()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -24,7 +24,7 @@ internal final class A {
}
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -32,8 +32,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Default.E>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
}
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
enum class E { ENTRY } // OK
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+8 -8
View File
@@ -37,16 +37,16 @@ internal final class A {
}
}
internal default object Default {
private constructor Default()
internal 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
internal final enum class E : kotlin.Enum<A.Default.E> {
public enum entry ENTRY : A.Default.E {
internal final enum class E : kotlin.Enum<A.Companion.E> {
public enum entry ENTRY : A.Companion.E {
private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -55,7 +55,7 @@ internal final class A {
}
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -63,8 +63,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Default.E>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
}
}
}
compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt
+1 -1
View File
@@ -6,7 +6,7 @@ enum class E {
ANOTHER
class Nested {
default object {
companion object {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+2 -2
View File
@@ -45,8 +45,8 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
default object {
companion object {
fun foo(): E = ENTRY
fun bar(): Array<E> = values()
fun baz(): E = valueOf("ENTRY")
compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+2 -2
View File
@@ -29,8 +29,8 @@ internal final enum class E : kotlin.Enum<E> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal final fun zab(): E
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val valuez: kotlin.Array<E>
internal final fun bar(): kotlin.Array<E>
internal final fun baz(): E
compiler/testData/diagnostics/tests/extensions/classObject.kt
+2 -2
View File
@@ -1,7 +1,7 @@
trait Tr
class A { default object }
class B { default object : Tr }
class A { companion object }
class B { companion object : Tr }
fun Any.f1() {}
fun Any?.f2() {}
compiler/testData/diagnostics/tests/extensions/classObject.txt
+4 -4
View File
@@ -13,8 +13,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -27,8 +27,8 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : Tr {
private constructor Default()
internal companion object Companion : Tr {
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/extensions/extensionMemberInClassObject.kt
+1 -1
View File
@@ -5,7 +5,7 @@ trait JPAEntityClass<D> {
}
class Foo {
default object : JPAEntityClass<Foo>
companion object : JPAEntityClass<Foo>
}
fun main(args: Array<String>) {
compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt
+2 -2
View File
@@ -9,8 +9,8 @@ internal final class Foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : JPAEntityClass<Foo> {
private constructor Default()
internal companion object Companion : JPAEntityClass<Foo> {
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/extensions/kt3470.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
fun foo() = toString()
}
}
compiler/testData/diagnostics/tests/extensions/kt3470.txt
+2 -2
View File
@@ -8,8 +8,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.String
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/imports/Imports.kt
+8 -8
View File
@@ -5,12 +5,12 @@ import b.B //class
import b.foo //function
import b.ext //extension function
import b.value //property
import b.C.Default.<!CANNOT_BE_IMPORTED!>bar<!> //function from default object
import b.C.Default.<!CANNOT_BE_IMPORTED!>cValue<!> //property from default object
import b.C.Companion.<!CANNOT_BE_IMPORTED!>bar<!> //function from companion object
import b.C.Companion.<!CANNOT_BE_IMPORTED!>cValue<!> //property from companion object
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>constant<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>fff<!> //function from val
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>constant<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>dValue<!> //property from val
import b.constant
import b.E.Default.<!CANNOT_BE_IMPORTED!>f<!> //val from default object
import b.E.Companion.<!CANNOT_BE_IMPORTED!>f<!> //val from companion object
import <!UNRESOLVED_REFERENCE!>smth<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>illegal<!>
import b.C.<!UNRESOLVED_REFERENCE!>smth<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>illegal<!>
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>smth<!>
@@ -42,7 +42,7 @@ fun B.ext() {}
val value = 0
class C() {
default object {
companion object {
fun bar() {}
val cValue = 1
}
@@ -56,7 +56,7 @@ class D() {
val constant = D()
class E() {
default object {
companion object {
val f = F()
}
}
@@ -85,14 +85,14 @@ fun foo() {
//FILE:d.kt
package d
import d.A.Default.B
import d.A.Default.C
import d.A.Companion.B
import d.A.Companion.C
val b : B = B()
val c : B = C
class A() {
default object {
companion object {
open class B() {}
object C : B() {}
}
compiler/testData/diagnostics/tests/imports/Imports.txt
+9 -9
View File
@@ -24,8 +24,8 @@ package b {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val cValue: kotlin.Int = 1
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -49,8 +49,8 @@ package b {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val f: b.F
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -81,8 +81,8 @@ package c {
}
package d {
internal val b: d.A.Default.B
internal val c: d.A.Default.B
internal val b: d.A.Companion.B
internal val c: d.A.Companion.B
internal final class A {
public constructor A()
@@ -90,8 +90,8 @@ package d {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -103,7 +103,7 @@ package d {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal object C : d.A.Default.B {
internal object C : d.A.Companion.B {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class A {
object J
}
default object CO {
companion object CO {
object H
}
}
compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
+1 -1
View File
@@ -22,7 +22,7 @@ package a {
}
}
internal default object CO {
internal companion object CO {
private constructor CO()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
+1 -1
View File
@@ -3,5 +3,5 @@ package bar
fun main(args : Array<String>) {
class Some
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_DEFAULT_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_COMPANION_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
}
compiler/testData/diagnostics/tests/inference/regressions/kt702.kt
+1 -1
View File
@@ -5,7 +5,7 @@ package a
fun getJavaClass<T>() : java.lang.Class<T> { <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
public class Throwables() {
default object {
companion object {
public fun propagateIfInstanceOf<X : Throwable?>(throwable : Throwable?, declaredType : Class<X<!BASE_WITH_NULLABLE_UPPER_BOUND!>?<!>>?) : Unit {
if (((throwable != null) && declaredType?.isInstance(throwable)!!))
{
compiler/testData/diagnostics/tests/inference/regressions/kt702.txt
+2 -2
View File
@@ -9,8 +9,8 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public default object Default {
private constructor Default()
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 final fun </*0*/ X : kotlin.Throwable?> propagateIfInstanceOf(/*0*/ throwable: kotlin.Throwable?, /*1*/ declaredType: java.lang.Class<X?>?): kotlin.Unit
compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class Test {
[`InnerAnnotation`InnerAnnotation]
default object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
companion object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
}
compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
Test.InnerAnnotation() Test.InnerAnnotation() internal default object Default : Test.StaticClass, Test.InnerClass {
private constructor Default()
Test.InnerAnnotation() Test.InnerAnnotation() internal companion object Companion : Test.StaticClass, Test.InnerClass {
private constructor Companion()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/inner/deepInnerClass.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A<T> {
class B {
fun test() {
class C<W>() : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
}
inner class D : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>>
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt
+1 -1
View File
@@ -7,7 +7,7 @@ object A {
}
class B {
default object {
companion object {
class LoginFormPage() : Request({
val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
})
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt
+2 -2
View File
@@ -45,8 +45,8 @@ package f {
}
}
internal default object Default {
private constructor Default()
internal 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/inner/illegalModifier.kt
+2 -2
View File
@@ -11,7 +11,7 @@ class D {
<!ILLEGAL_MODIFIER!>inner<!> object G
<!ILLEGAL_MODIFIER!>inner<!> enum class R
<!ILLEGAL_MODIFIER!>inner<!> annotation class S
<!ILLEGAL_MODIFIER!>inner<!> default object
<!ILLEGAL_MODIFIER!>inner<!> companion object
}
enum class H {
@@ -31,7 +31,7 @@ object N {
}
class P {
default object {
companion object {
<!INNER_CLASS_IN_OBJECT!>inner<!> class Q
}
}
compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+4 -4
View File
@@ -30,8 +30,8 @@ internal final class D {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -150,8 +150,8 @@ internal final class P {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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/inner/innerClassesInStaticParameters.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
fun test(<!UNUSED_PARAMETER!>t<!>: TestInner) = 42
}
compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
internal final fun test(/*0*/ t: Test.TestInner): kotlin.Int
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt
+2 -2
View File
@@ -1,11 +1,11 @@
open class SomeClass<T>
class TestSome<P> {
default object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
companion object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
}
}
class Test {
default object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
companion object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
val a = object: <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
}
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt
+4 -4
View File
@@ -15,8 +15,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : Test.InnerClass {
private constructor Default()
internal companion object Companion : Test.InnerClass {
private constructor Companion()
internal final val a: Test.InnerClass
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -38,8 +38,8 @@ internal final class TestSome</*0*/ P> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : SomeClass<P> {
private constructor Default()
internal companion object Companion : SomeClass<P> {
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/inner/nestedClassAccessedViaInstanceReference.kt
+4 -4
View File
@@ -1,24 +1,24 @@
trait N { fun foo() = 1 }
class WithClassObject {
default object {}
companion object {}
class Nested()
class NestedWithClassObject { default object : N }
class NestedWithClassObject { companion object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
class WithoutClassObject {
class Nested()
class NestedWithClassObject { default object : N }
class NestedWithClassObject { companion object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
object Obj {
class Nested()
class NestedWithClassObject { default object : N }
class NestedWithClassObject { companion object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+8 -8
View File
@@ -61,8 +61,8 @@ internal object Obj {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : N {
private constructor Default()
internal companion object Companion : N {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -77,8 +77,8 @@ internal final class WithClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -130,8 +130,8 @@ internal final class WithClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : N {
private constructor Default()
internal companion object Companion : N {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -192,8 +192,8 @@ internal final class WithoutClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : N {
private constructor Default()
internal companion object Companion : N {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

Some files were not shown because too many files have changed in this diff Show More