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