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
@@ -3,7 +3,7 @@
package foo
class Foo() {
default object {
companion object {
val bar = "Foo.bar ";
var boo = "FAIL";
fun baz() = "Foo.baz() "
@@ -4,7 +4,7 @@ class A {
private val p: Int
get() = 4
default object B {
companion object B {
val p: Int
get() = 6
}
@@ -1,7 +1,7 @@
package foo
trait A {
default object {
companion object {
val OK: String = "OK"
}
}
@@ -1,13 +1,13 @@
package foo
trait Named {
default object Bar {
companion object Bar {
val g = "a";
}
}
class Foo {
default object {
companion object {
val g = "b";
}
}
@@ -16,11 +16,11 @@ fun box(): String {
assertEquals("a", Named.Bar.g, "Named.Bar.g")
assertEquals("a", Named.g, "Named.g")
assertEquals("b", Foo.Default.g, "Foo.Default.g")
assertEquals("b", Foo.Companion.g, "Foo.Companion.g")
assertEquals("b", Foo.g, "Foo.g")
assertEquals("b", foo(Foo), "foo(Foo)")
assertEquals("b", foo(Foo.Default), "foo(Foo.Default)")
assertEquals("b", foo(Foo.Companion), "foo(Foo.Companion)")
assertEquals("c", Named.ext(), "Named.ext()")
assertEquals("c", Named.Bar.ext(), "Named.Bar.ext()")
@@ -28,6 +28,6 @@ fun box(): String {
return "OK"
}
fun foo(f: Foo.Default) = f.g
fun foo(f: Foo.Companion) = f.g
fun Named.Bar.ext() = "c"
@@ -2,7 +2,7 @@ package foo
class A {
var a = 3
default object {
companion object {
var a = -2
}
}
@@ -2,7 +2,7 @@ package foo
class A {
val a = 3
default object {
companion object {
val a = 2
val b = 5
}
@@ -5,13 +5,13 @@ open class A {
fun foo(): Int {
return 5
}
default object: A() {
companion object: A() {
val c = a
}
}
class B {
default object: A() {
companion object: A() {
}
}