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/psi/ByClauses.kt
+7 -7
View File
@@ -1,23 +1,23 @@
class A : b by a {
class object {}
default object {}
}
class A : b by a + b() * 5 {
class object {}
default object {}
}
class A : b by (a) {
class object {}
default object {}
}
class A : b by (a {}) {
class object {}
default object {}
}
class A : b by a[a {}] {
class object {}
default object {}
}
class A : b by a(a {}) {
class object {}
default object {}
}
class A : b by object {
fun f() = a {}
} {
class object {}
default object {}
}
compiler/testData/psi/ByClauses.txt
+14 -7
View File
@@ -24,7 +24,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -75,7 +76,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -111,7 +113,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -156,7 +159,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -204,7 +208,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -253,7 +258,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -314,7 +320,8 @@ JetFile: ByClauses.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/CommentsBinding.kt
+3 -3
View File
@@ -41,9 +41,9 @@ class D {
foo() // statement
} // end of foo
// class object
class object {
} // end of class object
// default object
default object {
} // end of default object
}
// This is v
compiler/testData/psi/CommentsBinding.txt
+4 -3
View File
@@ -264,9 +264,10 @@ JetFile: CommentsBinding.kt
PsiComment(EOL_COMMENT)('// end of foo')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiComment(EOL_COMMENT)('// class object')
PsiComment(EOL_COMMENT)('// default object')
PsiWhiteSpace('\n ')
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -275,7 +276,7 @@ JetFile: CommentsBinding.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace(' ')
PsiComment(EOL_COMMENT)('// end of class object')
PsiComment(EOL_COMMENT)('// end of default object')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
compiler/testData/psi/NamedClassObject.kt
+4 -4
View File
@@ -1,11 +1,11 @@
class A {
class object Default
default object Default
class object B
default object B
class object C {}
default object C {}
class object
default object
object C
}
compiler/testData/psi/NamedClassObject.txt
+8 -4
View File
@@ -10,7 +10,8 @@ JetFile: NamedClassObject.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -18,7 +19,8 @@ JetFile: NamedClassObject.kt
PsiElement(IDENTIFIER)('Default')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -26,7 +28,8 @@ JetFile: NamedClassObject.kt
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -38,7 +41,8 @@ JetFile: NamedClassObject.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n\n ')
compiler/testData/psi/SimpleClassMembers.kt
+10 -10
View File
@@ -19,23 +19,23 @@ class foo {
class Bar {
object foo {
class object {
default object {
}
private class object {
private default object {
}
private class object : Fooo {
private default object : Fooo {
}
private class object : Fooo, Bar by foo {
private default object : Fooo, Bar by foo {
}
private class object : Fooo, Bar by foo, Goo()
private default object : Fooo, Bar by foo, Goo()
}
class Bar {}
@@ -58,23 +58,23 @@ class foo {
typealias foo = bar
class object {
default object {
}
private class object {
private default object {
}
private class object : Fooo {
private default object : Fooo {
}
private class object : Fooo, Bar by foo {
private default object : Fooo, Bar by foo {
}
private class object : Fooo, Bar by foo, Goo()
private default object : Fooo, Bar by foo, Goo()
}
compiler/testData/psi/SimpleClassMembers.txt
+20 -18
View File
@@ -87,7 +87,8 @@ JetFile: SimpleClassMembers.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -99,8 +100,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -112,8 +113,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -134,8 +135,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -168,8 +169,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -279,7 +280,8 @@ JetFile: SimpleClassMembers.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -291,8 +293,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -304,8 +306,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -326,8 +328,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -360,8 +362,8 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/annotation/ShortAnnotations.kt
+1 -1
View File
@@ -9,7 +9,7 @@ foo bar(1) buzz<T>(1) zoo typealias T = Int
class Foo {
foo bar(1) buzz<T>(1) zoo class object {}
foo bar(1) buzz<T>(1) zoo default object {}
foo bar(1) buzz<T>(1) zoo class A
foo bar(1) buzz<T>(1) zoo object B
foo bar(1) buzz<T>(1) zoo fun a() {}
compiler/testData/psi/annotation/ShortAnnotations.txt
+2 -2
View File
@@ -474,8 +474,8 @@ JetFile: ShortAnnotations.kt
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/examples/PolymorphicClassObjects.kt
+1 -1
View File
@@ -9,7 +9,7 @@ open class Buildable {
class List<T> {
class object : Buildable {
default object : Buildable {
override fun newBuilder<E, R>() : Builder<E, R>
}
compiler/testData/psi/examples/PolymorphicClassObjects.txt
+2 -1
View File
@@ -132,7 +132,8 @@ JetFile: PolymorphicClassObjects.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/examples/UpdateOperation.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Pair(x : Int, y : Int) {
class object {
default object {
fun copy(from : Pair, x : Int = from.x, y : Int = from.y) = Pair(x, y)
}
}
compiler/testData/psi/examples/UpdateOperation.txt
+2 -1
View File
@@ -33,7 +33,8 @@ JetFile: UpdateOperation.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/recovery/kt2172.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class Foo {
class object {
default object {
val
}
}
compiler/testData/psi/recovery/kt2172.txt
+2 -1
View File
@@ -10,7 +10,8 @@ JetFile: kt2172.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiElement(class)('class')
MODIFIER_LIST
PsiElement(default)('default')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')