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/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt
+1 -1
View File
@@ -32,7 +32,7 @@ annotation class Ann(
)
class Foo {
default object {
companion object {
val i: Int = 2
val s: Short = 2
val f: Float = 2.0.toFloat()
compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
+1 -1
View File
@@ -15,7 +15,7 @@ annotation class Ann(val i: Int)
class A {
class B {
default object {
companion object {
val i = 1
}
}
compiler/testData/codegen/boxWithStdlib/callableReference/property/classObjectVar.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object B {
companion object B {
var state: String = "12345"
}
}
compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KMemberProperty
class A {
default object {
companion object {
val ref: KMemberProperty<A, String> = A::foo
}
compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt
+6 -6
View File
@@ -4,12 +4,12 @@ fun box(): String {
assertEquals(java.lang.Integer.MIN_VALUE, Int.MIN_VALUE)
assertEquals(java.lang.Byte.MAX_VALUE, Byte.MAX_VALUE)
assertEquals("MIN_VALUE", (Int.Default::MIN_VALUE).name)
assertEquals("MAX_VALUE", (Double.Default::MAX_VALUE).name)
assertEquals("MIN_VALUE", (Float.Default::MIN_VALUE).name)
assertEquals("MAX_VALUE", (Long.Default::MAX_VALUE).name)
assertEquals("MIN_VALUE", (Short.Default::MIN_VALUE).name)
assertEquals("MAX_VALUE", (Byte.Default::MAX_VALUE).name)
assertEquals("MIN_VALUE", (Int.Companion::MIN_VALUE).name)
assertEquals("MAX_VALUE", (Double.Companion::MAX_VALUE).name)
assertEquals("MIN_VALUE", (Float.Companion::MIN_VALUE).name)
assertEquals("MAX_VALUE", (Long.Companion::MAX_VALUE).name)
assertEquals("MIN_VALUE", (Short.Companion::MIN_VALUE).name)
assertEquals("MAX_VALUE", (Byte.Companion::MAX_VALUE).name)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt
+3 -3
View File
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
val defaultGetter: Int = 1
[native] get
@@ -39,8 +39,8 @@ fun box(): String {
return check({defaultGetter}, "_DefaultPackage.getDefaultGetter()I")
?: check({defaultSetter = 1}, "_DefaultPackage.setDefaultSetter(I)V")
?: check({C.defaultGetter}, "C\$Default.getDefaultGetter()I")
?: check({C.defaultSetter = 1}, "C\$Default.setDefaultSetter(I)V")
?: check({C.defaultGetter}, "C\$Companion.getDefaultGetter()I")
?: check({C.defaultSetter = 1}, "C\$Companion.setDefaultSetter(I)V")
?: check({C().defaultGetter}, "C.getDefaultGetter()I")
?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V")
compiler/testData/codegen/boxWithStdlib/native/privateStatic.kt
+1 -1
View File
@@ -2,7 +2,7 @@ import kotlin.jvm.*
import kotlin.platform.*
class C {
default object {
companion object {
private platformStatic native fun foo()
}
compiler/testData/codegen/boxWithStdlib/native/staticNative.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import kotlin.jvm.*
import kotlin.platform.*
class WithNative {
default object {
companion object {
platformStatic native fun bar(l: Long, s: String): Double
}
}
compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.platform.*
class C {
default object {
companion object {
private platformStatic fun foo(): String {
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt
+2 -2
View File
@@ -8,8 +8,8 @@ fun box(): String {
assertEquals("Int", Int::class.simpleName)
assertEquals("Long", Long::class.simpleName)
assertEquals("Default", Int.Default::class.simpleName)
assertEquals("Default", Double.Default::class.simpleName)
assertEquals("Companion", Int.Companion::class.simpleName)
assertEquals("Companion", Double.Companion::class.simpleName)
assertEquals("IntRange", IntRange::class.simpleName)
compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class O {
default object {
companion object {
// Currently we consider <clinit> in class O as the enclosing method of this lambda,
// so we write outer class = O and enclosing method = null
val f = {}
compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt
+2 -2
View File
@@ -5,13 +5,13 @@ class G<T>(val s: T) {
}
public trait ErrorsJvmTrait {
default object {
companion object {
public val param : G<String> = G("STRING")
}
}
public class ErrorsJvmClass {
default object {
companion object {
public val param : G<String> = G("STRING")
}
}
compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt
+1 -1
View File
@@ -6,7 +6,7 @@ open class B
class A {
default object {
companion object {
[platformStatic]
fun <T: B> a(s: T) : T {
return s
compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt
+9 -9
View File
@@ -1,7 +1,7 @@
import kotlin.test.assertEquals
class A {
default object {
companion object {
enum class Season {
WINTER
SPRING
@@ -11,19 +11,19 @@ class A {
}
}
fun foo(x : A.Default.Season) : String {
fun foo(x : A.Companion.Season) : String {
return when (x) {
A.Default.Season.WINTER -> "winter"
A.Default.Season.SPRING -> "spring"
A.Default.Season.SUMMER -> "summer"
A.Companion.Season.WINTER -> "winter"
A.Companion.Season.SPRING -> "spring"
A.Companion.Season.SUMMER -> "summer"
else -> "other"
}
}
fun box() : String {
assertEquals("winter", foo(A.Default.Season.WINTER))
assertEquals("spring", foo(A.Default.Season.SPRING))
assertEquals("summer", foo(A.Default.Season.SUMMER))
assertEquals("other", foo(A.Default.Season.AUTUMN))
assertEquals("winter", foo(A.Companion.Season.WINTER))
assertEquals("spring", foo(A.Companion.Season.SPRING))
assertEquals("summer", foo(A.Companion.Season.SUMMER))
assertEquals("other", foo(A.Companion.Season.AUTUMN))
return "OK"
}