jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-08 15:53:19 +00:00
Code Issues 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

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt
View File

@@ -1,6 +1,6 @@
package test
trait TheTrait {
default object {
companion object {
}
}

4
compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt
View File

@@ -2,7 +2,7 @@ package test
internal trait TheTrait {
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
}
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt
View File

@@ -1,7 +1,7 @@
package test
class Some {
TestAnnotation default object {
TestAnnotation companion object {
annotation class TestAnnotation
}
}

4
compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt
View File

@@ -3,8 +3,8 @@ package test
internal final class Some {
/*primary*/ public constructor Some()
test.Some.Default.TestAnnotation() internal default object Default {
/*primary*/ private constructor Default()
test.Some.Companion.TestAnnotation() internal companion object Companion {
/*primary*/ private constructor Companion()
internal final annotation class TestAnnotation : kotlin.Annotation {
/*primary*/ public constructor TestAnnotation()