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/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"