jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-11 00:21:29 +00:00
Code Issues 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

2
compiler/testData/codegen/boxWithJava/classObjectAccessor/J.java
View File

@@ -1,5 +1,5 @@
public class J {
public static int f() {
return A.Default.getI1() + A.OBJECT$.getI2() + B.Named.getI1() + B.OBJECT$.getI2();
return A.Companion.getI1() + A.OBJECT$.getI2() + B.Named.getI1() + B.OBJECT$.getI2();
}
}

4
compiler/testData/codegen/boxWithJava/classObjectAccessor/classObject.kt
View File

@@ -1,12 +1,12 @@
class A {
default object {
companion object {
val i1 = 1
val i2 = 2
}
}
class B {
default object Named {
companion object Named {
val i1 = 3
val i2 = 4
}

2
compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt
View File

@@ -7,7 +7,7 @@ annotation class testAnnotation
class A {
default object {
companion object {
val b: String = "OK"
platformStatic testAnnotation fun test1() = b

2
compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt
View File

@@ -2,7 +2,7 @@ import kotlin.platform.platformStatic
class A {
default object {
companion object {
val b: String = "OK"
platformStatic val c: String = "OK"

6
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt
View File

@@ -1,17 +1,17 @@
class Klass {
default object {
companion object {
val NAME = "Klass"
}
}
trait Trait {
default object {
companion object {
val NAME = "Trait"
}
}
enum class Enoom {
default object {
companion object {
val NAME = "Enoom"
}
}