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
@@ -4,7 +4,7 @@
package test
internal final class ClassWithClassObject() {
internal default object {
internal companion object {
internal final val a: test.A /* compiled code */
public final var b: test.B /* compiled code */
@@ -4,7 +4,7 @@ class ClassWithClassObject {
fun f() {
}
default object {
companion object {
fun f() {
}
@@ -4,5 +4,5 @@
package test
public final class DependencyOnNestedClasses() : dependency.D.Nested {
internal final fun f(nc: dependency.D.Default.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ }
internal final fun f(nc: dependency.D.Companion.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ }
}
@@ -8,7 +8,7 @@ class D {
class Nested
}
default object {
companion object {
class NestedInClassObject
}
}
@@ -3,7 +3,7 @@ package test
import dependency.*
public class DependencyOnNestedClasses : D.Nested() {
fun f(nc: D.Default.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
fun f(nc: D.Companion.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
return D.Nested()
}
}