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/scopes/VisibilityInClassObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun devNull(<!UNUSED_PARAMETER!>obj<!>: Any?) {}
open class A {
class object {
default object {
val internal_val = 1
public val public_val: Int = 2
private val private_val = 3
compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt
+1 -1
View File
@@ -10,7 +10,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
internal final val internal_val: kotlin.Int = 1
private final val private_val: kotlin.Int = 3
compiler/testData/diagnostics/tests/scopes/kt587.kt
+2 -2
View File
@@ -1,9 +1,9 @@
// KT-587 Unresolved reference
class Main {
class object {
default object {
class States() {
class object {
default object {
public val N: States = States() // : States unresolved
}
}
compiler/testData/diagnostics/tests/scopes/kt587.txt
+2 -2
View File
@@ -6,7 +6,7 @@ internal final class Main {
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
@@ -18,7 +18,7 @@ internal final class Main {
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 final val N: Main.Default.States
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/scopes/kt900-1.kt
+3 -3
View File
@@ -1,4 +1,4 @@
// import all members from class object
// import all members from default object
package c
import c.A.Default.B
@@ -10,9 +10,9 @@ fun foo() {
}
class A() {
class object {
default object {
class B() {
class object {
default object {
}
}
}
compiler/testData/diagnostics/tests/scopes/kt900-1.txt
+2 -2
View File
@@ -9,7 +9,7 @@ package 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
@@ -21,7 +21,7 @@ package 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/scopes/kt900.kt
+4 -4
View File
@@ -13,9 +13,9 @@ fun foo() {
}
class A() {
class object {
default object {
class B() {
class object {
default object {
fun foo() {}
}
}
@@ -49,9 +49,9 @@ fun foo() {
}
class A() {
class object {
default object {
class B() {
class object {
default object {
fun foo() {}
}
}
compiler/testData/diagnostics/tests/scopes/kt900.txt
+4 -4
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()
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 @@ 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
@@ -65,7 +65,7 @@ package 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
@@ -77,7 +77,7 @@ package 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
internal final fun foo(): kotlin.Unit