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,5 +1,5 @@
class A {
default object {
companion object {
var xi = 0
var xin : Int? = 0
var xinn : Int? = null
@@ -1,5 +1,5 @@
class C() {
default object {
companion object {
fun create() = C()
}
}
@@ -1,7 +1,7 @@
fun Any.foo() = 1
class A {
default object
companion object
}
fun box() = if (A.foo() == 1) "OK" else "fail"
@@ -1,7 +1,7 @@
var global = 0;
class C {
default object {
companion object {
{
global = 1;
}
@@ -1,5 +1,5 @@
class A() {
default object {
companion object {
val value = 10
}
}
@@ -1,7 +1,7 @@
// EA-38323 - Illegal field modifiers in class: classObject field in C must be static and final
trait C {
default object {
companion object {
public val FOO: String = "OK"
}
}
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
fun values() = "O"
fun valueOf() = "K"
}
@@ -1,7 +1,7 @@
class SomeClass { default object }
class SomeClass { companion object }
fun box() =
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Default@[0-9a-fA-F]+"))
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Companion@[0-9a-fA-F]+"))
"OK"
else
"Fail: $SomeClass"
@@ -1,5 +1,5 @@
class C() {
default object {
companion object {
private fun <T> create() = C()
}
@@ -1,5 +1,5 @@
open class Test {
default object {
companion object {
fun testStatic(ic: InnerClass): NotInnerClass = NotInnerClass(ic.value)
}
@@ -2,7 +2,7 @@ class A {
private val p: Int
get() = 4
default object B {
companion object B {
val p: Int
get() = 6
}
@@ -1,5 +1,5 @@
class C() {
default object Foo
companion object Foo
}
fun C.Foo.create() = 3
@@ -4,7 +4,7 @@ public class StockMarketTableModel() {
return COLUMN_TITLES?.size()!!
}
default object {
companion object {
private val COLUMN_TITLES : Array<Int?> = arrayOfNulls<Int>(10)
}
}
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
val b = 0
val c = b
@@ -1,13 +1,13 @@
package x
class Outer() {
default object {
companion object {
class Inner() {
}
}
}
fun box (): String {
val inner = Outer.Default.Inner()
val inner = Outer.Companion.Inner()
return "OK"
}
@@ -1,7 +1,7 @@
open class Factory(p: Int)
class A {
default object : Factory(1)
companion object : Factory(1)
}
fun box() : String {
@@ -2,7 +2,7 @@ package mult_constructors_3_bug
public open class Identifier() {
private var myNullable : Boolean = true
default object {
companion object {
open public fun init(isNullable : Boolean) : Identifier {
val __ = Identifier()
__.myNullable = isNullable
@@ -1,5 +1,5 @@
class C() {
default object Foo {
companion object Foo {
fun create() = 3
}
}