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
@@ -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 {