azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 'class object' with 'default object' in renderers and test data

Browse Source 
Includes changes to decompiled text
Old syntax is used in builtins and project code for now
This commit is contained in:
Pavel V. Talanov
2015-03-06 12:51:59 +03:00
parent 28ed30bcb3
commit 59f192ef90
794 changed files with 1120 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt
+5 -5
View File
@@ -5,7 +5,7 @@ internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
internal final val some: kotlin.Int = 12
internal final fun <get-some>(): kotlin.Int
internal class object Default {
internal default object Default {
/*primary*/ private constructor Default()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
@@ -17,7 +17,7 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
internal final val some: test?
internal final fun <get-some>(): test?
internal class object Default {
internal default object Default {
/*primary*/ private constructor Default()
internal trait test {
@@ -32,7 +32,7 @@ internal final class TestClassObjectAndClassConflict {
internal final val some: kotlin.String = "More"
internal final fun <get-some>(): kotlin.String
internal class object Default {
internal default object Default {
/*primary*/ private constructor Default()
internal final val bla: kotlin.Int = 12
internal final fun <get-bla>(): kotlin.Int
@@ -44,7 +44,7 @@ internal final class TestConstructorParamClassObjectConflict {
internal final val some: kotlin.String
internal final fun <get-some>(): kotlin.String
internal class object Default {
internal default object Default {
/*primary*/ private constructor Default()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
@@ -58,7 +58,7 @@ internal final class TestConstructorValClassObjectConflict {
internal final val test: kotlin.String
internal final fun <get-test>(): kotlin.String
internal class object Default {
internal default object Default {
/*primary*/ private constructor Default()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int