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
@@ -790,7 +790,7 @@ fun main(args: Array<String>) {
model("codegen/box/bridges", targetBackend = TargetBackend.JS)
}
testClass(javaClass<AbstractDefaultObjectTest>()) {
testClass(javaClass<AbstractCompanionObjectTest>()) {
model("codegen/box/objectIntrinsics", targetBackend = TargetBackend.JS)
}
}
@@ -56,8 +56,8 @@ fun box(): String {
) {
commonCasesWithTestNotRenamed()
case("class", "class $KEYWORD_MARKER { default object {} }", "", testNotRenamedByName)
case("trait", "trait $KEYWORD_MARKER { default object {} }", "", testNotRenamedByName)
case("class", "class $KEYWORD_MARKER { companion object {} }", "", testNotRenamedByName)
case("trait", "trait $KEYWORD_MARKER { companion object {} }", "", testNotRenamedByName)
case("enum", "enum class $KEYWORD_MARKER { foo }", "", testNotRenamed("$KEYWORD_MARKER.foo"))
case("object", "object $KEYWORD_MARKER {}", "", testNotRenamedByName)
}
@@ -106,7 +106,7 @@ fun box(): String {
suite("insideClassObject",
"""
class TestClass {
default object {
companion object {
$DEFINITION_MARKER
fun test() {