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/MultipleBounds.kt
+1 -1
View File
@@ -72,7 +72,7 @@ val t3 = test2<C>(C())
class Test<T>
where
<!UNSUPPORTED!>class object T : <!FINAL_CLASS_OBJECT_UPPER_BOUND!>Foo<!><!>,
<!UNSUPPORTED!>class object T : <!FINAL_DEFAULT_OBJECT_UPPER_BOUND!>Foo<!><!>,
<!UNSUPPORTED!>class object T : A<!> {}
val <T, B : T> x : Int = 0
compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
+15 -15
View File
@@ -3,24 +3,24 @@ package foo
class X {}
val s = <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>java<!>
val ss = <!NO_CLASS_OBJECT!>System<!>
val sss = <!NO_CLASS_OBJECT!>X<!>
val x = "${<!NO_CLASS_OBJECT!>System<!>}"
val ss = <!NO_DEFAULT_OBJECT!>System<!>
val sss = <!NO_DEFAULT_OBJECT!>X<!>
val x = "${<!NO_DEFAULT_OBJECT!>System<!>}"
val xs = java.<!EXPRESSION_EXPECTED_PACKAGE_FOUND!>lang<!>
val xss = java.lang.<!NO_CLASS_OBJECT!>System<!>
val xsss = foo.<!NO_CLASS_OBJECT!>X<!>
val xss = java.lang.<!NO_DEFAULT_OBJECT!>System<!>
val xsss = foo.<!NO_DEFAULT_OBJECT!>X<!>
val xssss = <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>foo<!>
val f = { <!NO_CLASS_OBJECT!>System<!> }
val f = { <!NO_DEFAULT_OBJECT!>System<!> }
fun main(args : Array<String>) {
<!EXPRESSION_EXPECTED_PACKAGE_FOUND!>java<!> = null
<!NO_CLASS_OBJECT!>System<!> = null
<!NO_CLASS_OBJECT!>System<!>!!
java.lang.<!NO_CLASS_OBJECT!>System<!> = null
java.lang.<!NO_CLASS_OBJECT!>System<!>!!
<!NO_CLASS_OBJECT!>System<!> is Int
<!NO_DEFAULT_OBJECT!>System<!> = null
<!NO_DEFAULT_OBJECT!>System<!>!!
java.lang.<!NO_DEFAULT_OBJECT!>System<!> = null
java.lang.<!NO_DEFAULT_OBJECT!>System<!>!!
<!NO_DEFAULT_OBJECT!>System<!> is Int
<!INVISIBLE_MEMBER!>System<!>()
(<!NO_CLASS_OBJECT!>System<!>)
@foo <!NO_CLASS_OBJECT!>System<!>
null in <!NO_CLASS_OBJECT!>System<!>
}
(<!NO_DEFAULT_OBJECT!>System<!>)
@foo <!NO_DEFAULT_OBJECT!>System<!>
null in <!NO_DEFAULT_OBJECT!>System<!>
}
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()
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt
+1 -1
View File
@@ -28,7 +28,7 @@ object O {
fun f() {
A.c
A.hashCode()
A().<!NO_CLASS_OBJECT, NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE!>Nested<!>
A().<!NO_DEFAULT_OBJECT, NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE!>Nested<!>
A.Nested()
A().Inner()
A.Default.<!UNRESOLVED_REFERENCE!>Nested<!>
compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt
+2 -2
View File
@@ -2,7 +2,7 @@
class A {
inner class B {
<!CLASS_OBJECT_NOT_ALLOWED!>class object<!> { }
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> { }
}
}
@@ -22,4 +22,4 @@ class C {
class D {
class object { }
}
}
}
compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt
+2 -2
View File
@@ -1,9 +1,9 @@
fun test() {
class A {
<!CLASS_OBJECT_NOT_ALLOWED!>class object<!> {}
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {}
}
object {
<!CLASS_OBJECT_NOT_ALLOWED!>class object<!> {}
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {}
}
}
compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// !DIAGNOSTICS: -MANY_CLASS_OBJECTS -REDECLARATION
// !DIAGNOSTICS: -MANY_DEFAULT_OBJECTS -REDECLARATION
// KT-3464 Front-end shouldn't allow override modifier in class declaration
compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt
+1 -1
View File
@@ -2,7 +2,7 @@ enum class E {
FIRST
SECOND {
<!CLASS_OBJECT_NOT_ALLOWED!>class object<!> {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package bar
fun main(args : Array<String>) {
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_CLASS_OBJECT!>String<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_DEFAULT_OBJECT!>String<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
}
compiler/testData/diagnostics/tests/inner/deepInnerClass.kt
+2 -2
View File
@@ -4,11 +4,11 @@ class A<T> {
class B {
fun test() {
class C<W>() : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!CLASS_OBJECT_NOT_ALLOWED!>class object<!> : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
}
inner class D : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>>
}
}
}
}
}
compiler/testData/diagnostics/tests/regressions/kt2956.kt
+1 -1
View File
@@ -1 +1 @@
val a: String = <!NO_CLASS_OBJECT!>Nothing<!>
val a: String = <!NO_DEFAULT_OBJECT!>Nothing<!>
compiler/testData/diagnostics/tests/regressions/kt4827.kt
+1 -1
View File
@@ -11,6 +11,6 @@ class C {
}
fun f() {
<!NO_CLASS_OBJECT, FUNCTION_EXPECTED!>TestInterface<!>()
<!NO_DEFAULT_OBJECT, FUNCTION_EXPECTED!>TestInterface<!>()
C.<!UNRESOLVED_REFERENCE!>I<!>()
}