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
@@ -3,7 +3,7 @@ package test
annotation class Anno
class Class {
default object {
companion object {
[Anno] var property: Int = 42
}
}
@@ -7,8 +7,8 @@ internal final annotation class Anno : kotlin.Annotation {
internal final class Class {
/*primary*/ public constructor Class()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
test.Anno() internal final var property: kotlin.Int
internal final fun <get-property>(): kotlin.Int
internal final fun <set-property>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
@@ -1,7 +1,7 @@
package test
class A {
default object {
companion object {
annotation class Anno1
class B {
@@ -10,4 +10,4 @@ class A {
}
}
A.Default.Anno1 A.Default.B.Anno2 class C
A.Companion.Anno1 A.Companion.B.Anno2 class C
@@ -3,8 +3,8 @@ package test
internal final class A {
/*primary*/ public constructor A()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final annotation class Anno1 : kotlin.Annotation {
/*primary*/ public constructor Anno1()
@@ -20,6 +20,6 @@ internal final class A {
}
}
test.A.Default.Anno1() test.A.Default.B.Anno2() internal final class C {
test.A.Companion.Anno1() test.A.Companion.B.Anno2() internal final class C {
/*primary*/ public constructor C()
}
@@ -3,7 +3,7 @@ package test
annotation class Anno
class Class {
default object {
companion object {
Anno class Nested
}
}
@@ -7,8 +7,8 @@ internal final annotation class Anno : kotlin.Annotation {
internal final class Class {
/*primary*/ public constructor Class()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
test.Anno() internal final class Nested {
/*primary*/ public constructor Nested()
@@ -3,5 +3,5 @@ package test
annotation class Anno
class Class {
Anno default object
Anno companion object
}
@@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation {
internal final class Class {
/*primary*/ public constructor Class()
test.Anno() internal default object Default {
/*primary*/ private constructor Default()
test.Anno() internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
@@ -3,7 +3,7 @@ package test
class A {
class B {
default object {
companion object {
val TEST = 1
}
}
@@ -6,8 +6,8 @@ internal final class A {
internal final class B {
/*primary*/ public constructor B()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val TEST: kotlin.Int = 1
internal final fun <get-TEST>(): kotlin.Int
}
@@ -6,5 +6,5 @@ deprecated("Class") class Class {
deprecated("Inner") inner class Inner
deprecated("default object") default object
deprecated("companion object") companion object
}
@@ -3,8 +3,8 @@ package test
kotlin.deprecated(value = "Class": kotlin.String) internal final class Class {
/*primary*/ public constructor Class()
kotlin.deprecated(value = "default object": kotlin.String) internal default object Default {
/*primary*/ private constructor Default()
kotlin.deprecated(value = "companion object": kotlin.String) internal companion object Companion {
/*primary*/ private constructor Companion()
}
kotlin.deprecated(value = "Inner": kotlin.String) internal final inner class Inner {
@@ -10,5 +10,5 @@ Anno(ElementType.METHOD) class Class {
Anno(ElementType.TYPE) class Nested
Anno(ElementType.ANNOTATION_TYPE) default object
Anno(ElementType.ANNOTATION_TYPE) companion object
}
@@ -9,8 +9,8 @@ internal final annotation class Anno : kotlin.Annotation {
test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final class Class {
/*primary*/ public constructor Class()
test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) internal default object Default {
/*primary*/ private constructor Default()
test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) internal companion object Companion {
/*primary*/ private constructor Companion()
}
test.Anno(t = ElementType.PARAMETER: java.lang.annotation.ElementType) internal final inner class Inner {
@@ -3,7 +3,7 @@ package test
annotation class Anno
class Class {
default object {
companion object {
[Anno] val property: Int
get() = 42
}
@@ -7,8 +7,8 @@ internal final annotation class Anno : kotlin.Annotation {
internal final class Class {
/*primary*/ public constructor Class()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
test.Anno() internal final val property: kotlin.Int
internal final fun <get-property>(): kotlin.Int
}
@@ -3,7 +3,7 @@ package test
annotation class Anno
trait Trait {
default object {
companion object {
[Anno] val property: Int
get() = 42
}
@@ -6,8 +6,8 @@ internal final annotation class Anno : kotlin.Annotation {
internal trait Trait {
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
test.Anno() internal final val property: kotlin.Int
internal final fun <get-property>(): kotlin.Int
}
@@ -2,7 +2,7 @@
package test
class ConstructorTypeParamClassObjectTypeConflict<test> {
default object {
companion object {
trait test
}
@@ -10,7 +10,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
}
class ConstructorTypeParamClassObjectConflict<test> {
default object {
companion object {
val test = 12
}
@@ -18,7 +18,7 @@ class ConstructorTypeParamClassObjectConflict<test> {
}
class TestConstructorParamClassObjectConflict(test: String) {
default object {
companion object {
val test = 12
}
@@ -27,7 +27,7 @@ class TestConstructorParamClassObjectConflict(test: String) {
class TestConstructorValClassObjectConflict(val test: String) {
default object {
companion object {
val test = 12
}
@@ -35,7 +35,7 @@ class TestConstructorValClassObjectConflict(val test: String) {
}
class TestClassObjectAndClassConflict {
default object {
companion object {
val bla = 12
}
@@ -5,8 +5,8 @@ internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
internal final val some: kotlin.Int = 12
internal final fun <get-some>(): kotlin.Int
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
@@ -17,8 +17,8 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
internal final val some: test?
internal final fun <get-some>(): test?
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal trait test {
}
@@ -32,8 +32,8 @@ internal final class TestClassObjectAndClassConflict {
internal final val some: kotlin.String = "More"
internal final fun <get-some>(): kotlin.String
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val bla: kotlin.Int = 12
internal final fun <get-bla>(): kotlin.Int
}
@@ -44,8 +44,8 @@ internal final class TestConstructorParamClassObjectConflict {
internal final val some: kotlin.String
internal final fun <get-some>(): kotlin.String
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
@@ -58,8 +58,8 @@ internal final class TestConstructorValClassObjectConflict {
internal final val test: kotlin.String
internal final fun <get-test>(): kotlin.String
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
@@ -2,7 +2,7 @@
package test
public class Outer {
public default object {
public companion object {
public object Obj {
public val v: String = "val"
public fun f(): String = "fun"
@@ -3,8 +3,8 @@ package test
public final class Outer {
/*primary*/ public constructor Outer()
public default object Default {
/*primary*/ private constructor Default()
public companion object Companion {
/*primary*/ private constructor Companion()
public object Obj {
/*primary*/ private constructor Obj()
@@ -2,7 +2,7 @@
package test
class ClassObjectDeclaresProperty {
default object {
companion object {
val i = 1
}
}
@@ -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
}
@@ -2,7 +2,7 @@
package test
class ClassObjectDeclaresProperty {
default object {
companion object {
var s = ""
}
}
@@ -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
@@ -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 {}
}
@@ -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()
}
}
@@ -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 {}
}
@@ -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()
}
}
@@ -3,6 +3,6 @@ package test
trait Bbb
class ClassObjectextendsTrait {
default object : Bbb {
companion object : Bbb {
}
}
@@ -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()
}
}
@@ -3,6 +3,6 @@ package test
trait Bbb<P>
class ClassObjectExtendsTraitWithTP {
default object : Bbb<String> {
companion object : Bbb<String> {
}
}
@@ -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()
}
}
@@ -2,7 +2,7 @@
package test
class A {
default object {
companion object {
val some = 1
}
@@ -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
}
@@ -7,5 +7,5 @@ trait T {
class A : T {
override fun foo(): Int = 42
default object : T by A()
companion object : T by A()
}
@@ -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
}
}
@@ -2,7 +2,7 @@
package test
class TestFirst {
default object {
companion object {
fun testing(a: InnerClass) = 45
fun testing(a: NotInnerClass) = 45
}
@@ -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
}
@@ -1,7 +1,7 @@
package test
class NamedClassObject {
default object Named {
companion object Named {
fun f(): Int = 1
}
}
@@ -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
}
@@ -1,6 +1,6 @@
package test
class SimpleClassObject() {
default object {
companion object {
}
}
@@ -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()
}
}
@@ -3,7 +3,7 @@ package test
class Test {
default object {
companion object {
public val prop1 : Int = 10
@@ -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
@@ -3,7 +3,7 @@ package test
trait Test {
default object {
companion object {
public val prop1 : Int = 10
@@ -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
@@ -1,7 +1,7 @@
package test
class A {
default object { }
companion object { }
enum class E {
ENTRY
}
@@ -3,8 +3,8 @@ package test
internal final class A {
/*primary*/ public constructor A()
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
internal final enum class E : kotlin.Enum<test.A.E> {
@@ -1,6 +1,6 @@
package test
trait TheTrait {
default object {
companion object {
}
}
@@ -2,7 +2,7 @@ package test
internal trait TheTrait {
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}
@@ -1,7 +1,7 @@
package test
class Some {
TestAnnotation default object {
TestAnnotation companion object {
annotation class TestAnnotation
}
}
@@ -3,8 +3,8 @@ package test
internal final class Some {
/*primary*/ public constructor Some()
test.Some.Default.TestAnnotation() internal default object Default {
/*primary*/ private constructor Default()
test.Some.Companion.TestAnnotation() internal companion object Companion {
/*primary*/ private constructor Companion()
internal final annotation class TestAnnotation : kotlin.Annotation {
/*primary*/ public constructor TestAnnotation()