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

Replace 'class object' with 'default object' in renderers and test data

Browse Source 
Includes changes to decompiled text
Old syntax is used in builtins and project code for now
This commit is contained in:
Pavel V. Talanov
2015-03-06 12:51:59 +03:00
parent 28ed30bcb3
commit 59f192ef90
794 changed files with 1120 additions and 1109 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
class object {
default object {
val y = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>x<!>
}
}
compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt
+1 -1
View File
@@ -7,7 +7,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 class object Default {
internal default object Default {
private constructor Default()
internal final val y: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
+3 -3
View File
@@ -9,7 +9,7 @@ fun test() {
}
class A() {
public class object {
public default object {
val d = 3
private object f {
@@ -19,12 +19,12 @@ class A() {
class B {
class D {
private class object
private default object
}
}
class CCC() {
private class object {
private default object {
val classObjectVar = 3
}
}
compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt
+3 -3
View File
@@ -9,7 +9,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object Default {
public default object Default {
private constructor Default()
internal final val d: kotlin.Int = 3
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,7 +37,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private class object Default {
private default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,7 +52,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private class object Default {
private default object Default {
private constructor Default()
internal final val classObjectVar: kotlin.Int = 3
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
+6 -6
View File
@@ -1,22 +1,22 @@
package Jet86
class A {
<!REDECLARATION!>class object<!> {
default <!REDECLARATION!>object<!> {
val x = 1
}
<!MANY_DEFAULT_OBJECTS, REDECLARATION!>class object<!> {
default <!MANY_DEFAULT_OBJECTS, REDECLARATION!>object<!> {
val x = 1
}
}
class AA {
class object {
default object {
val x = 1
}
<!MANY_DEFAULT_OBJECTS!>class object A<!> {
default <!MANY_DEFAULT_OBJECTS!>object A<!> {
val x = 1
}
<!MANY_DEFAULT_OBJECTS!>class object AA<!> {
default <!MANY_DEFAULT_OBJECTS!>object AA<!> {
val x = 1
}
}
@@ -26,7 +26,7 @@ class B() {
}
object b {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {
default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {
val x = 1
} // error
}
compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt
+6 -6
View File
@@ -13,7 +13,7 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -21,7 +21,7 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal class object Default {
internal default object Default {
private constructor Default()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -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 class object A {
internal default 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 class object AA {
internal default 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,7 +52,7 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal class object Default {
internal default object Default {
private constructor Default()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -75,7 +75,7 @@ package Jet86 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
inner class Inner
class object {
default object {
class Nested2
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt
+1 -1
View File
@@ -9,7 +9,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
internal final val c: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt
+5 -5
View File
@@ -2,16 +2,16 @@
class A {
inner class B {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> { }
default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> { }
}
}
class B {
class object {
default object {
class B {
class object {
default object {
class C {
class object { }
default object { }
}
}
}
@@ -20,6 +20,6 @@ class B {
class C {
class D {
class object { }
default object { }
}
}
compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt
+5 -5
View File
@@ -12,7 +12,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 class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,7 +27,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 class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -39,7 +39,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 class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,7 +51,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 class object Default {
internal default object Default {
private constructor Default()
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,7 +75,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 class object Default {
internal default object Default {
private constructor Default()
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/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> {
class object : ToResolve<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>({testFun(it)}) {
default object : ToResolve<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>({testFun(it)}) {
}
}
compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt
+1 -1
View File
@@ -9,7 +9,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : test.ToResolve<P> {
internal default object Default : test.ToResolve<P> {
private constructor Default()
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/classObjectInLocalClass.kt
+2 -2
View File
@@ -1,9 +1,9 @@
fun test() {
class A {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {}
default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {}
}
object {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {}
default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {}
}
}
compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt
+3 -3
View File
@@ -3,11 +3,11 @@ package test
class A {
object <!REDECLARATION!>Default<!>
<!REDECLARATION!>class object<!>
default <!REDECLARATION!>object<!>
}
class B {
class object <!REDECLARATION!>Named<!>
default object <!REDECLARATION!>Named<!>
object <!REDECLARATION!>Named<!>
}
@@ -15,5 +15,5 @@ class B {
class C {
class <!REDECLARATION!>Named<!>
class object <!REDECLARATION!>Named<!>
default object <!REDECLARATION!>Named<!>
}
compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt
+3 -3
View File
@@ -15,7 +15,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal class object Default {
internal default object Default {
private constructor Default()
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 test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal class object Named {
internal default 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 class object Named {
internal default 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/importClassInClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package f
import f.A.Default.B
class A {
class object {
default object {
class B
}
}
compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt
+1 -1
View File
@@ -9,7 +9,7 @@ package f {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
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/invisibleClassObjects.kt
+4 -4
View File
@@ -2,25 +2,25 @@
package a
class A {
class object {
default object {
fun foo() {}
}
}
private class B {
class object {
default object {
fun bar() {}
}
}
class C {
private class object {
private default object {
fun baz() {}
}
}
private class D {
private class object {
private default object {
fun quux() {}
}
}
compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt
+4 -4
View File
@@ -8,7 +8,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
@@ -23,7 +23,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private class object Default {
private default object Default {
private constructor Default()
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -38,7 +38,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private class object Default {
private default object Default {
private constructor Default()
internal final fun baz(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -53,7 +53,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private class object Default {
private default object Default {
private constructor Default()
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/kt3866.kt
+2 -2
View File
@@ -4,11 +4,11 @@ open class C {
fun C.foo() {}
open class X {
class object : C() {}
default object : C() {}
}
open class Y {
class object : C() {}
default object : C() {}
}
fun bar() {
compiler/testData/diagnostics/tests/classObjects/kt3866.txt
+2 -2
View File
@@ -16,7 +16,7 @@ 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 class object Default : C {
internal default object Default : C {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -30,7 +30,7 @@ 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 class object Default : C {
internal default object Default : C {
private constructor Default()
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/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 class object A {
internal default 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 class object B {
internal default 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 class object C {
internal default 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 class object A {
internal default 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 class object B {
internal default 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 class object C {
internal default 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
+2 -2
View File
@@ -1,8 +1,8 @@
class A {
private class object {
private default object {
class B {
class C {
class object {
default object {
fun foo() {}
}
}
compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt
+2 -2
View File
@@ -9,7 +9,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
private class object Default {
private default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,7 +27,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 class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
class Test {
fun test(): Int = 12
class object {
default 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
+1 -1
View File
@@ -9,7 +9,7 @@ package test {
internal final fun test(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
internal final val a: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean