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

Refactor: process mentions of class object

Browse Source 
Rename usages that refer to "default object" concept now
Test data file names are left as is
This commit is contained in:
Pavel V. Talanov
2015-03-03 17:28:24 +03:00
parent 27f5d71e4f
commit 48fbce9582
137 changed files with 471 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
+5 -5
View File
@@ -4,7 +4,7 @@ class A {
<!REDECLARATION!>class object<!> {
val x = 1
}
<!MANY_CLASS_OBJECTS, REDECLARATION!>class object<!> {
<!MANY_DEFAULT_OBJECTS, REDECLARATION!>class object<!> {
val x = 1
}
}
@@ -13,10 +13,10 @@ class AA {
class object {
val x = 1
}
<!MANY_CLASS_OBJECTS!>class object A<!> {
<!MANY_DEFAULT_OBJECTS!>class object A<!> {
val x = 1
}
<!MANY_CLASS_OBJECTS!>class object AA<!> {
<!MANY_DEFAULT_OBJECTS!>class object AA<!> {
val x = 1
}
}
@@ -26,7 +26,7 @@ class B() {
}
object b {
<!CLASS_OBJECT_NOT_ALLOWED!>class object<!> {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {
val x = 1
} // error
}
@@ -35,7 +35,7 @@ val a = A.x
val c = B.<!UNRESOLVED_REFERENCE!>x<!>
val d = b.<!UNRESOLVED_REFERENCE!>x<!>
val s = <!NO_CLASS_OBJECT!>System<!> // error
val s = <!NO_DEFAULT_OBJECT!>System<!> // error
fun test() {
System.out.println()
java.lang.System.out.println()