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

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
@@ -40,7 +40,7 @@ class Outer {
}
class ClassObject {
default object {
companion object {
}
}
@@ -9,6 +9,6 @@ fun g(t: T): Int {
B.f()
A
B
A.Default
B.Default
A.Companion
B.Companion
}
@@ -3,12 +3,12 @@ package a
trait T
class A {
default object: T {
companion object: T {
}
}
class B {
default object {
companion object {
fun f(): Int
}
}
@@ -18,8 +18,8 @@ class B {
B.f()
A
B
A.Default
B.Default
A.Companion
B.Companion
}</selection>
@@ -7,7 +7,7 @@ class A {
f()
}</selection>
default object {
companion object {
fun f()
}
}
@@ -2,5 +2,5 @@ package to
import a.Outer
fun f(n: Outer.Default.Nested, e: Outer.Default.NestedEnum, o: Outer.Default.NestedObj, t: Outer.Default.NestedTrait, a: Outer.Default.NestedAnnotation) {
fun f(n: Outer.Companion.Nested, e: Outer.Companion.NestedEnum, o: Outer.Companion.NestedObj, t: Outer.Companion.NestedTrait, a: Outer.Companion.NestedAnnotation) {
}
@@ -1,13 +1,13 @@
package a
import a.Outer.Default.Nested
import a.Outer.Default.NestedEnum
import a.Outer.Default.NestedObj
import a.Outer.Default.NestedTrait
import a.Outer.Default.NestedAnnotation
import a.Outer.Companion.Nested
import a.Outer.Companion.NestedEnum
import a.Outer.Companion.NestedObj
import a.Outer.Companion.NestedTrait
import a.Outer.Companion.NestedAnnotation
class Outer {
default object {
companion object {
class Nested {
}
enum class NestedEnum {
@@ -1,7 +1,7 @@
package a
class a {
default object {
companion object {
}
}
@@ -37,6 +37,6 @@ class Outer {
}
class ClassObject {
default object {
companion object {
}
}
@@ -38,6 +38,6 @@ class Outer {
}
class ClassObject {
default object {
companion object {
}
}
@@ -40,7 +40,7 @@ class Outer {
}
class ClassObject {
default object {
companion object {
}
}
@@ -19,7 +19,7 @@ object O2 {
}
class ClassObject {
default object {
companion object {
}
}
@@ -19,7 +19,7 @@ object O2 {
}
class ClassObject {
default object {
companion object {
}
}