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/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt
+1 -1
View File
@@ -2,7 +2,7 @@
package test
class ClassObjectDeclaresProperty {
default object {
companion object {
val i = 1
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt
+2 -2
View File
@@ -3,8 +3,8 @@ package test
internal final class ClassObjectDeclaresProperty {
/*primary*/ public constructor ClassObjectDeclaresProperty()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val i: kotlin.Int = 1
internal final fun <get-i>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt
+1 -1
View File
@@ -2,7 +2,7 @@
package test
class ClassObjectDeclaresProperty {
default object {
companion object {
var s = ""
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt
+2 -2
View File
@@ -3,8 +3,8 @@ package test
internal final class ClassObjectDeclaresProperty {
/*primary*/ public constructor ClassObjectDeclaresProperty()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final var s: kotlin.String
internal final fun <get-s>(): kotlin.String
internal final fun <set-s>(/*0*/ <set-?>: kotlin.String): kotlin.Unit
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt
+3 -3
View File
@@ -1,14 +1,14 @@
package test
public class Pub {
default object {}
companion object {}
}
private class Pri {
default object {}
companion object {}
}
class Int {
default object {}
companion object {}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt
+6 -6
View File
@@ -3,23 +3,23 @@ package test
internal final class Int {
/*primary*/ public constructor Int()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
private final class Pri {
/*primary*/ public constructor Pri()
private default object Default {
/*primary*/ private constructor Default()
private companion object Companion {
/*primary*/ private constructor Companion()
}
}
public final class Pub {
/*primary*/ public constructor Pub()
public default object Default {
/*primary*/ private constructor Default()
public companion object Companion {
/*primary*/ private constructor Companion()
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt
+9 -9
View File
@@ -1,37 +1,37 @@
package test
public class PubPri {
private default object {}
private companion object {}
}
public class PubInt {
internal default object {}
internal companion object {}
}
public class PubPub {
public default object {}
public companion object {}
}
internal class IntPri {
private default object {}
private companion object {}
}
internal class IntInt {
internal default object {}
internal companion object {}
}
internal class IntPub {
public default object {}
public companion object {}
}
private class PriPri {
private default object {}
private companion object {}
}
private class PriInt {
internal default object {}
internal companion object {}
}
private class PriPub {
public default object {}
public companion object {}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.txt
+18 -18
View File
@@ -3,71 +3,71 @@ package test
internal final class IntInt {
/*primary*/ public constructor IntInt()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
internal final class IntPri {
/*primary*/ public constructor IntPri()
private default object Default {
/*primary*/ private constructor Default()
private companion object Companion {
/*primary*/ private constructor Companion()
}
}
internal final class IntPub {
/*primary*/ public constructor IntPub()
public default object Default {
/*primary*/ private constructor Default()
public companion object Companion {
/*primary*/ private constructor Companion()
}
}
private final class PriInt {
/*primary*/ public constructor PriInt()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
private final class PriPri {
/*primary*/ public constructor PriPri()
private default object Default {
/*primary*/ private constructor Default()
private companion object Companion {
/*primary*/ private constructor Companion()
}
}
private final class PriPub {
/*primary*/ public constructor PriPub()
public default object Default {
/*primary*/ private constructor Default()
public companion object Companion {
/*primary*/ private constructor Companion()
}
}
public final class PubInt {
/*primary*/ public constructor PubInt()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
public final class PubPri {
/*primary*/ public constructor PubPri()
private default object Default {
/*primary*/ private constructor Default()
private companion object Companion {
/*primary*/ private constructor Companion()
}
}
public final class PubPub {
/*primary*/ public constructor PubPub()
public default object Default {
/*primary*/ private constructor Default()
public companion object Companion {
/*primary*/ private constructor Companion()
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt
+1 -1
View File
@@ -3,6 +3,6 @@ package test
trait Bbb
class ClassObjectextendsTrait {
default object : Bbb {
companion object : Bbb {
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt
+2 -2
View File
@@ -6,7 +6,7 @@ internal trait Bbb {
internal final class ClassObjectextendsTrait {
/*primary*/ public constructor ClassObjectextendsTrait()
internal default object Default : test.Bbb {
/*primary*/ private constructor Default()
internal companion object Companion : test.Bbb {
/*primary*/ private constructor Companion()
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt
+1 -1
View File
@@ -3,6 +3,6 @@ package test
trait Bbb<P>
class ClassObjectExtendsTraitWithTP {
default object : Bbb<String> {
companion object : Bbb<String> {
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
+2 -2
View File
@@ -6,7 +6,7 @@ internal trait Bbb</*0*/ P> {
internal final class ClassObjectExtendsTraitWithTP {
/*primary*/ public constructor ClassObjectExtendsTraitWithTP()
internal default object Default : test.Bbb<kotlin.String> {
/*primary*/ private constructor Default()
internal companion object Companion : test.Bbb<kotlin.String> {
/*primary*/ private constructor Companion()
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt
+1 -1
View File
@@ -2,7 +2,7 @@
package test
class A {
default object {
companion object {
val some = 1
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt
+2 -2
View File
@@ -5,8 +5,8 @@ internal final class A {
internal final val other: kotlin.Int = 1
internal final fun <get-other>(): kotlin.Int
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val some: kotlin.Int = 1
internal final fun <get-some>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt
+1 -1
View File
@@ -7,5 +7,5 @@ trait T {
class A : T {
override fun foo(): Int = 42
default object : T by A()
companion object : T by A()
}
compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt
+2 -2
View File
@@ -4,8 +4,8 @@ internal final class A : test.T {
/*primary*/ public constructor A()
internal open override /*1*/ fun foo(): kotlin.Int
internal default object Default : test.T {
/*primary*/ private constructor Default()
internal companion object Companion : test.T {
/*primary*/ private constructor Companion()
internal open override /*1*/ /*delegation*/ fun foo(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt
+1 -1
View File
@@ -2,7 +2,7 @@
package test
class TestFirst {
default object {
companion object {
fun testing(a: InnerClass) = 45
fun testing(a: NotInnerClass) = 45
}
compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt
+2 -2
View File
@@ -3,8 +3,8 @@ package test
internal final class TestFirst {
/*primary*/ public constructor TestFirst()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final fun testing(/*0*/ a: test.TestFirst.InnerClass): kotlin.Int
internal final fun testing(/*0*/ a: test.TestFirst.NotInnerClass): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package test
class NamedClassObject {
default object Named {
companion object Named {
fun f(): Int = 1
}
}
compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
internal final class NamedClassObject {
/*primary*/ public constructor NamedClassObject()
internal default object Named {
internal companion object Named {
/*primary*/ private constructor Named()
internal final fun f(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
class SimpleClassObject() {
default object {
companion object {
}
}
compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package test
internal final class SimpleClassObject {
/*primary*/ public constructor SimpleClassObject()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
class Test {
default object {
companion object {
public val prop1 : Int = 10
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt
+2 -2
View File
@@ -3,8 +3,8 @@ package test
internal final class Test {
/*primary*/ public constructor Test()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
public final val prop1: kotlin.Int = 10
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
trait Test {
default object {
companion object {
public val prop1 : Int = 10
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt
+2 -2
View File
@@ -2,8 +2,8 @@ package test
internal trait Test {
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
public final val prop1: kotlin.Int = 10
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int