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/inner/classesInClassObjectHeader.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class Test {
[`InnerAnnotation`InnerAnnotation]
default object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
companion object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
}
compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
Test.InnerAnnotation() Test.InnerAnnotation() internal default object Default : Test.StaticClass, Test.InnerClass {
private constructor Default()
Test.InnerAnnotation() Test.InnerAnnotation() internal companion object Companion : Test.StaticClass, Test.InnerClass {
private constructor Companion()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/inner/deepInnerClass.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A<T> {
class B {
fun test() {
class C<W>() : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
}
inner class D : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>>
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt
+1 -1
View File
@@ -7,7 +7,7 @@ object A {
}
class B {
default object {
companion object {
class LoginFormPage() : Request({
val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
})
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt
+2 -2
View File
@@ -45,8 +45,8 @@ package f {
}
}
internal default object Default {
private constructor Default()
internal 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
compiler/testData/diagnostics/tests/inner/illegalModifier.kt
+2 -2
View File
@@ -11,7 +11,7 @@ class D {
<!ILLEGAL_MODIFIER!>inner<!> object G
<!ILLEGAL_MODIFIER!>inner<!> enum class R
<!ILLEGAL_MODIFIER!>inner<!> annotation class S
<!ILLEGAL_MODIFIER!>inner<!> default object
<!ILLEGAL_MODIFIER!>inner<!> companion object
}
enum class H {
@@ -31,7 +31,7 @@ object N {
}
class P {
default object {
companion object {
<!INNER_CLASS_IN_OBJECT!>inner<!> class Q
}
}
compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+4 -4
View File
@@ -30,8 +30,8 @@ internal final class D {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -150,8 +150,8 @@ internal final class P {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
fun test(<!UNUSED_PARAMETER!>t<!>: TestInner) = 42
}
compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
internal final fun test(/*0*/ t: Test.TestInner): kotlin.Int
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt
+2 -2
View File
@@ -1,11 +1,11 @@
open class SomeClass<T>
class TestSome<P> {
default object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
companion object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
}
}
class Test {
default object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
companion object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
val a = object: <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
}
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt
+4 -4
View File
@@ -15,8 +15,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : Test.InnerClass {
private constructor Default()
internal companion object Companion : Test.InnerClass {
private constructor Companion()
internal final val a: Test.InnerClass
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -38,8 +38,8 @@ internal final class TestSome</*0*/ P> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : SomeClass<P> {
private constructor Default()
internal companion object Companion : SomeClass<P> {
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
compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt
+4 -4
View File
@@ -1,24 +1,24 @@
trait N { fun foo() = 1 }
class WithClassObject {
default object {}
companion object {}
class Nested()
class NestedWithClassObject { default object : N }
class NestedWithClassObject { companion object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
class WithoutClassObject {
class Nested()
class NestedWithClassObject { default object : N }
class NestedWithClassObject { companion object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
object Obj {
class Nested()
class NestedWithClassObject { default object : N }
class NestedWithClassObject { companion object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+8 -8
View File
@@ -61,8 +61,8 @@ internal object Obj {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : N {
private constructor Default()
internal companion object Companion : N {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -77,8 +77,8 @@ internal final class WithClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal 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
@@ -130,8 +130,8 @@ internal final class WithClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : N {
private constructor Default()
internal companion object Companion : N {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -192,8 +192,8 @@ internal final class WithoutClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : N {
private constructor Default()
internal companion object Companion : N {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt
+2 -2
View File
@@ -1,11 +1,11 @@
class Outer {
class Nested {
default object {
companion object {
fun foo() = 42
}
}
default object {
companion object {
fun bar() = 239
}
}
compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt
+4 -4
View File
@@ -9,8 +9,8 @@ internal final class Outer {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final fun bar(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,8 +23,8 @@ internal final class Outer {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt
+1 -1
View File
@@ -1,7 +1,7 @@
open class PackageTest
class MoreTest() {
default object: PackageTest() {
companion object: PackageTest() {
}
compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class MoreTest {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : PackageTest {
private constructor Default()
internal companion object Companion : PackageTest {
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
compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class Test {
[ClassObjectAnnotation]
[NestedAnnotation]
default object {
companion object {
annotation class ClassObjectAnnotation
}
compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
+2 -2
View File
@@ -6,8 +6,8 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
Test.Default.ClassObjectAnnotation() Test.NestedAnnotation() internal default object Default {
private constructor Default()
Test.Companion.ClassObjectAnnotation() Test.NestedAnnotation() internal 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