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/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