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/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt
+3 -3
View File
@@ -11,7 +11,7 @@ class A {
nativeGetter
fun foo(a: Double): String? = null
class object {
default object {
nativeGetter
fun get(a: String): Any? = null
@@ -31,7 +31,7 @@ class B {
nativeGetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
val foo<!> = 0
@@ -66,7 +66,7 @@ class C {
nativeGetter
fun baz(<!NATIVE_INDEXER_CAN_NOT_HAVE_DEFAULT_ARGUMENTS!>a: String = "foo"<!>): Int? = 0
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
fun Int.get(a: String): Int?<!> = 1
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
+3 -3
View File
@@ -9,7 +9,7 @@ kotlin.js.native() internal final class A {
kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String?
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
kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
@@ -27,7 +27,7 @@ kotlin.js.native() 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()
kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -64,7 +64,7 @@ kotlin.js.native() internal final class C {
kotlin.js.nativeGetter() internal final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
kotlin.js.nativeGetter() internal final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): 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/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt
+2 -2
View File
@@ -13,7 +13,7 @@ class A {
nativeGetter
fun foo(a: Double): String? = null
class object {
default object {
nativeGetter
fun get(a: String): Any? = null
@@ -32,7 +32,7 @@ class A {
nativeGetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
+2 -2
View File
@@ -22,7 +22,7 @@ kotlin.js.native() internal final class A {
kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String?
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
kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
@@ -40,7 +40,7 @@ kotlin.js.native() 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()
kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt
+2 -2
View File
@@ -12,7 +12,7 @@ class A {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
fun foo(a: Double): String?<!> = null
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
fun get(a: String): Any?<!> = null
@@ -40,7 +40,7 @@ class A {
nativeGetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt
+2 -2
View File
@@ -22,7 +22,7 @@ internal final class A {
kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String?
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
kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
@@ -43,7 +43,7 @@ internal final class A {
kotlin.js.nativeGetter() internal final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String?
kotlin.js.nativeGetter() internal final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String?
internal class object Default {
internal default object Default {
private constructor Default()
kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt
+2 -2
View File
@@ -10,7 +10,7 @@ class A {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
fun foo(a: Double): String?<!> = null
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
fun get(a: String): Any?<!> = null
@@ -29,7 +29,7 @@ class B {
nativeGetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeGetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt
+2 -2
View File
@@ -9,7 +9,7 @@ internal final class A {
kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String?
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
kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
@@ -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()
kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt
+1 -1
View File
@@ -20,7 +20,7 @@ class A {
nativeInvoke
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
nativeInvoke
fun foo() {}
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
+1 -1
View File
@@ -11,7 +11,7 @@ kotlin.js.native() internal final class A {
kotlin.js.nativeInvoke() internal final fun kotlin.Int.ext(): kotlin.Int
kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
kotlin.js.nativeInvoke() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class A {
fun Int.invoke(a: String, b: Int)<!> = "OK"
}
class object {
default object {
nativeInvoke
fun foo() {}
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
+1 -1
View File
@@ -24,7 +24,7 @@ kotlin.js.native() internal final class A {
kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): 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
kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt
+1 -1
View File
@@ -24,7 +24,7 @@ class A {
fun invoke(a: String): Int<!> = 0
}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeInvoke
fun foo()<!> {}
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt
+1 -1
View File
@@ -24,7 +24,7 @@ internal final class A {
kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): 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
kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class A {
nativeInvoke
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeInvoke
fun foo()<!> {}
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt
+1 -1
View File
@@ -11,7 +11,7 @@ internal final class A {
kotlin.js.nativeInvoke() internal final fun kotlin.Int.ext(): kotlin.Int
kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): 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
kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt
+2 -2
View File
@@ -17,7 +17,7 @@ class A {
nativeSetter
fun set5(a: Double, v: String): CharSequence = "OK"
class object {
default object {
nativeSetter
fun set(a: String, v: Any?): Any? = null
@@ -43,7 +43,7 @@ class B {
nativeSetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
+2 -2
View File
@@ -11,7 +11,7 @@ kotlin.js.native() internal final class A {
kotlin.js.nativeSetter() internal final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
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
kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
@@ -31,7 +31,7 @@ kotlin.js.native() 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()
kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt
+2 -2
View File
@@ -19,7 +19,7 @@ class A {
nativeSetter
fun set5(a: Double, v: String): CharSequence = "OK"
class object {
default object {
nativeSetter
fun set(a: String, v: Any?): Any? = null
@@ -44,7 +44,7 @@ class A {
nativeSetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
+2 -2
View File
@@ -24,7 +24,7 @@ kotlin.js.native() internal final class A {
kotlin.js.nativeSetter() internal final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
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
kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
@@ -44,7 +44,7 @@ kotlin.js.native() 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()
kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt
+2 -2
View File
@@ -18,7 +18,7 @@ class A {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
fun set5(a: Double, v: String): CharSequence<!> = "OK"
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
fun set(a: String, v: Any?): Any?<!> = null
@@ -37,7 +37,7 @@ class A {
nativeSetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt
+2 -2
View File
@@ -24,7 +24,7 @@ internal final class A {
kotlin.js.nativeSetter() internal final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence
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
kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
@@ -42,7 +42,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()
kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt
+2 -2
View File
@@ -10,7 +10,7 @@ class A {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
fun foo(a: Int, v: String)<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
fun set(a: String, v: Any?): Any?<!> = null
@@ -29,7 +29,7 @@ class B {
nativeSetter
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>object Obj1<!> {}
class object {
default object {
<!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>nativeSetter
val foo<!> = 0
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt
+2 -2
View File
@@ -9,7 +9,7 @@ internal final class A {
kotlin.js.nativeSetter() internal final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any?
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
kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
@@ -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()
kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt
+2 -2
View File
@@ -23,7 +23,7 @@ trait T {
fun foo()
fun bar() {}
class object {
default object {
val baz: Int
val boo: Int = noImpl
@@ -40,7 +40,7 @@ class C {
fun foo()
fun bar() {}
class object {
default object {
val baz: Int
val boo: Int = noImpl
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt
+2 -2
View File
@@ -19,7 +19,7 @@ kotlin.js.native() 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()
internal final val baz: kotlin.Int
internal final val boo: kotlin.Int
@@ -50,7 +50,7 @@ kotlin.js.native() internal trait T {
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 baz: kotlin.Int
internal final val boo: kotlin.Int