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/imports/Imports.kt
+6 -6
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 class object
import b.C.Default.<!CANNOT_BE_IMPORTED!>cValue<!> //property from class object
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.<!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 class object
import b.E.Default.<!CANNOT_BE_IMPORTED!>f<!> //val from default 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() {
class object {
default object {
fun bar() {}
val cValue = 1
}
@@ -56,7 +56,7 @@ class D() {
val constant = D()
class E() {
class object {
default object {
val f = F()
}
}
@@ -92,7 +92,7 @@ val b : B = B()
val c : B = C
class A() {
class object {
default object {
open class B() {}
object C : B() {}
}
compiler/testData/diagnostics/tests/imports/Imports.txt
+3 -3
View File
@@ -24,7 +24,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()
internal final val cValue: kotlin.Int = 1
internal final fun bar(): kotlin.Unit
@@ -49,7 +49,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()
internal final val f: b.F
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -90,7 +90,7 @@ package d {
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/imports/StarImportFromObject.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class A {
object J
}
class object CO {
default object CO {
object H
}
}
compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
+1 -1
View File
@@ -22,7 +22,7 @@ package a {
}
}
internal class object CO {
internal default 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