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
@@ -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)
@@ -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 = {}
@@ -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")
}
}
@@ -6,7 +6,7 @@ open class B
class A {
default object {
companion object {
[platformStatic]
fun <T: B> a(s: T) : T {
return s