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/multimodule/duplicateClass/duplicateNestedClasses.kt
+7 -7
View File
@@ -7,7 +7,7 @@ package p
public class A {
public class B
public object C
default object {
companion object {
public class D {
public object E
}
@@ -21,10 +21,10 @@ public class M1 {
public val a: A = A()
public val b: A.B = A.B()
public val c: A.C = A.C
public val d: A.Default.D = A.Default.D()
public val e: A.Default.D.E = A.Default.D.E
public val d: A.Companion.D = A.Companion.D()
public val e: A.Companion.D.E = A.Companion.D.E
public val f: A.F = A().F()
public val g: A.Default.G = A.Default.G()
public val g: A.Companion.G = A.Companion.G()
}
// MODULE: m2
@@ -35,7 +35,7 @@ package p
public class A {
public class B
public class C
default object {
companion object {
public class D {
public class E
}
@@ -47,8 +47,8 @@ public class A {
public fun a(p: A) {}
public fun b(p: A.B) {}
public fun c(p: A.C) {}
public fun d(p: A.Default.D) {}
public fun e(p: A.Default.D.E) {}
public fun d(p: A.Companion.D) {}
public fun e(p: A.Companion.D.E) {}
public fun f(p: A.F) {}
public fun g(p: A.G) {}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
+11 -11
View File
@@ -23,8 +23,8 @@ package p {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -64,10 +64,10 @@ package p {
public final val a: p.A
public final val b: p.A.B
public final val c: p.A.C
public final val d: p.A.Default.D
public final val e: p.A.Default.D.E
public final val d: p.A.Companion.D
public final val e: p.A.Companion.D.E
public final val f: p.A.F
public final val g: p.A.Default.G
public final val g: p.A.Companion.G
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -82,8 +82,8 @@ package p {
public fun a(/*0*/ p: p.A): kotlin.Unit
public fun b(/*0*/ p: p.A.B): kotlin.Unit
public fun c(/*0*/ p: p.A.C): kotlin.Unit
public fun d(/*0*/ p: p.A.Default.D): kotlin.Unit
public fun e(/*0*/ p: p.A.Default.D.E): kotlin.Unit
public fun d(/*0*/ p: p.A.Companion.D): kotlin.Unit
public fun e(/*0*/ p: p.A.Companion.D.E): kotlin.Unit
public fun f(/*0*/ p: p.A.F): kotlin.Unit
public fun g(/*0*/ p: p.A.G): kotlin.Unit
@@ -107,8 +107,8 @@ package p {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -154,8 +154,8 @@ package p {
public fun a(/*0*/ p: p.A): kotlin.Unit
public fun b(/*0*/ p: p.A.B): kotlin.Unit
public fun c(/*0*/ p: p.A.C): kotlin.Unit
public fun d(/*0*/ p: p.A.Default.D): kotlin.Unit
public fun e(/*0*/ p: p.A.Default.D.E): kotlin.Unit
public fun d(/*0*/ p: p.A.Companion.D): kotlin.Unit
public fun e(/*0*/ p: p.A.Companion.D.E): kotlin.Unit
public fun f(/*0*/ p: p.A.F): kotlin.Unit
public fun g(/*0*/ p: p.A.G): kotlin.Unit