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
js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt
+1 -1
View File
@@ -4,7 +4,7 @@ package foo
import kotlin.reflect.KMemberProperty
class A {
default object {
companion object {
val ref: KMemberProperty<A, String> = A::foo
}
js/js.translator/testData/classObject/cases/accessing.kt
+1 -1
View File
@@ -3,7 +3,7 @@
package foo
class Foo() {
default object {
companion object {
val bar = "Foo.bar ";
var boo = "FAIL";
fun baz() = "Foo.baz() "
js/js.translator/testData/classObject/cases/defaultObjectSameNamesAsInOuter.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A {
private val p: Int
get() = 4
default object B {
companion object B {
val p: Int
get() = 6
}
js/js.translator/testData/classObject/cases/inTrait.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package foo
trait A {
default object {
companion object {
val OK: String = "OK"
}
}
js/js.translator/testData/classObject/cases/namedClassObject.kt
+5 -5
View File
@@ -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"
js/js.translator/testData/classObject/cases/setVar.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
class A {
var a = 3
default object {
companion object {
var a = -2
}
}
js/js.translator/testData/classObject/cases/simple.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
class A {
val a = 3
default object {
companion object {
val a = 2
val b = 5
}
js/js.translator/testData/classObject/cases/withInheritance.kt
+2 -2
View File
@@ -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() {
}
}
js/js.translator/testData/closure/cases/closureInObject.kt
+1 -1
View File
@@ -8,7 +8,7 @@ object A {
}
class B {
default object {
companion object {
val a = 21
fun foo() = 3
js/js.translator/testData/closure/cases/closureThisAndClassObject.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
class A {
fun foo() = "O"
default object {
companion object {
fun bar() = "K"
}
js/js.translator/testData/examples/sortedTests/unsupported/classObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C() {
default object {
companion object {
fun create() = C()
}
}
js/js.translator/testData/examples/sortedTests/unsupported/classObjectInterface.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class C() {
fun getInstance(): Runnable = C
default object: Runnable {
companion object: Runnable {
override fun run(): Unit {
}
}
js/js.translator/testData/examples/sortedTests/unsupported/classObjectMethod.kt
+2 -2
View File
@@ -3,11 +3,11 @@ abstract open class Default {
}
class MyInt() {
default object : Default {
companion object : Default {
override fun defaultValue(): Int = 610
}
}
fun toDefault<T : Any>(t: T) where default object T : Default = T.defaultValue()
fun toDefault<T : Any>(t: T) where class object T : Default = T.defaultValue()
fun box(): String = if (toDefault<MyInt>(MyInt()) == 610) "OK" else "fail"
js/js.translator/testData/inline/cases/classObject.kt
+1 -1
View File
@@ -15,7 +15,7 @@ class InlineAll {
return s()
}
default object {
companion object {
inline fun inline(s: () -> String): String {
return s()
}
js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt
+1 -1
View File
@@ -11,7 +11,7 @@ trait InlineTrait {
return s()
}
default object {
companion object {
inline final fun finalInline(s: () -> String): String {
return s()
}
js/js.translator/testData/inlineStdlib/cases/callNameClash.kt
+1 -1
View File
@@ -7,7 +7,7 @@ fun f(x: Int): Int = x * 2
fun Int.f(): Int = this * 3
class A(var value: Int) {
default object {
companion object {
fun f(): Int = 5
}
js/js.translator/testData/native/cases/classObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
native
class A(val c: Int) {
native
default object {
companion object {
val g: Int = noImpl
val c: String = noImpl
}
js/js.translator/testData/native/cases/nestedElements.kt
+9 -9
View File
@@ -97,7 +97,7 @@ object Object {
var b: String = noImpl
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
@@ -109,7 +109,7 @@ object Object {
var b: String = noImpl
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
@@ -121,7 +121,7 @@ object Object {
var b: String
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
@@ -145,7 +145,7 @@ class Class {
var b: String = noImpl
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
@@ -162,14 +162,14 @@ class Class {
var b: String
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
}
}
default object {
companion object {
native("aaa")
val a: Trait = noImpl
var b: String = noImpl
@@ -190,7 +190,7 @@ trait Trait {
var b: String = noImpl
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
@@ -203,14 +203,14 @@ trait Trait {
var b: String
fun test(): Int = noImpl
default object {
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
}
}
default object {
companion object {
val a: Trait = noImpl
var b: String = noImpl
fun test(): Int = noImpl
js/js.translator/testData/native/cases/vararg.kt
+1 -1
View File
@@ -24,7 +24,7 @@ fun Bar.test2(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl
native
class Bar(val size: Int, order: Int = 0) {
fun test(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl
default object {
companion object {
fun startNewTest(): Boolean = noImpl
var hasOrderProblem: Boolean = false
}
js/js.translator/testData/object/cases/objectInObject.kt
+1 -1
View File
@@ -14,7 +14,7 @@ object B {
}
class C {
default object {
companion object {
fun ov() = "d"
}
object query {
js/js.translator/testData/reservedWords/cases/insideClassObjectFunEnum.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun enum() { enum() }
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun eval() { eval() }
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectFunFor.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun `for`() { `for`() }
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectFunIf.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun `if`() { `if`() }
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExport.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun foo(export: String) {
assertEquals("123", export)
testRenamed("export", { export })
js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun foo(extends: String) {
assertEquals("123", extends)
testRenamed("extends", { extends })
js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIn.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun foo(`in`: String) {
assertEquals("123", `in`)
testRenamed("in", { `in` })
js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamNull.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
fun foo(`null`: String) {
assertEquals("123", `null`)
testRenamed("null", { `null` })
js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFinally.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val t: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val t: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectLabelPackage.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val t: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectLabelReturn.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val t: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectValConst.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val const: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectValContinue.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val `continue`: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val debugger: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectValDo.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
val `do`: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectVarDefault.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
var default: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
var delete: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectVarElse.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
var `else`: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/insideClassObjectVarFalse.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
default object {
companion object {
var `false`: Int = 0
fun test() {
js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class delete { default object {} }
class delete { companion object {} }
fun box(): String {
testNotRenamed("delete", { delete })
js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class enum { default object {} }
class enum { companion object {} }
fun box(): String {
testNotRenamed("enum", { enum })
js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class `package` { default object {} }
class `package` { companion object {} }
fun box(): String {
testNotRenamed("package", { `package` })
js/js.translator/testData/reservedWords/cases/toplevelClassReturn.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class `return` { default object {} }
class `return` { companion object {} }
fun box(): String {
testNotRenamed("return", { `return` })
js/js.translator/testData/reservedWords/cases/toplevelTraitEval.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
trait eval { default object {} }
trait eval { companion object {} }
fun box(): String {
testNotRenamed("eval", { eval })
js/js.translator/testData/reservedWords/cases/toplevelTraitExport.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
trait export { default object {} }
trait export { companion object {} }
fun box(): String {
testNotRenamed("export", { export })
js/js.translator/testData/reservedWords/cases/toplevelTraitSuper.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
trait `super` { default object {} }
trait `super` { companion object {} }
fun box(): String {
testNotRenamed("super", { `super` })
js/js.translator/testData/reservedWords/cases/toplevelTraitThis.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
trait `this` { default object {} }
trait `this` { companion object {} }
fun box(): String {
testNotRenamed("this", { `this` })