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
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt
+10 -10
View File
@@ -5,8 +5,8 @@ internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
internal final val some: kotlin.Int = 12
internal final fun <get-some>(): kotlin.Int
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
@@ -17,8 +17,8 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
internal final val some: test?
internal final fun <get-some>(): test?
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal trait test {
}
@@ -32,8 +32,8 @@ internal final class TestClassObjectAndClassConflict {
internal final val some: kotlin.String = "More"
internal final fun <get-some>(): kotlin.String
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val bla: kotlin.Int = 12
internal final fun <get-bla>(): kotlin.Int
}
@@ -44,8 +44,8 @@ internal final class TestConstructorParamClassObjectConflict {
internal final val some: kotlin.String
internal final fun <get-some>(): kotlin.String
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
@@ -58,8 +58,8 @@ internal final class TestConstructorValClassObjectConflict {
internal final val test: kotlin.String
internal final fun <get-test>(): kotlin.String
internal default object Default {
/*primary*/ private constructor Default()
internal companion object Companion {
/*primary*/ private constructor Companion()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}