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

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt
+19 -19
View File
@@ -1,55 +1,55 @@
<!ILLEGAL_MODIFIER!>default<!> class A {
default object {
<!ILLEGAL_MODIFIER!>companion<!> class A {
companion object {
}
}
class B {
default object
companion object
val c: Int = 1
}
class C {
default object A {
companion object A {
}
}
class D {
default object A {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object {
companion object A {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {
}
}
}
<!ILLEGAL_MODIFIER!>default<!> object G {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object
<!ILLEGAL_MODIFIER!>companion<!> object G {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object
}
<!ILLEGAL_MODIFIER!>default<!> trait H {
default object
<!ILLEGAL_MODIFIER!>companion<!> trait H {
companion object
}
class J {
default object C {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object
companion object C {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object
}
}
<!ILLEGAL_MODIFIER!>default<!> enum class Enum {
<!ILLEGAL_MODIFIER!>companion<!> enum class Enum {
E1
E2
default object
companion object
}
<!ILLEGAL_MODIFIER!>default<!> fun main() {
<!ILLEGAL_MODIFIER!>companion<!> fun main() {
}
<!ILLEGAL_MODIFIER!>default<!> var prop: Int = 1
<!ILLEGAL_MODIFIER!>default<!> get
<!ILLEGAL_MODIFIER!>default<!> set
<!ILLEGAL_MODIFIER!>companion<!> var prop: Int = 1
<!ILLEGAL_MODIFIER!>companion<!> get
<!ILLEGAL_MODIFIER!>companion<!> set
class Z(<!ILLEGAL_MODIFIER!>default<!> val c: Int)
class Z(<!ILLEGAL_MODIFIER!>companion<!> val c: Int)