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

Serialize compile time constant for property initializer

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-02-06 14:53:13 +04:00
parent bb7312b47f
commit 9b5050dddd
23 changed files with 80 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal final class A {
internal class object <class-object-for-B> {
/*primary*/ private constructor <class-object-for-B>()
internal final val TEST: kotlin.Int
internal final val TEST: kotlin.Int = 1.toInt()
internal final fun <get-TEST>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int
test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int = 42.toInt()
internal fun <get-bar>(): kotlin.Int
test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun foo(): kotlin.Unit
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt
+7 -7
View File
@@ -2,12 +2,12 @@ package test
internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
/*primary*/ public constructor ConstructorTypeParamClassObjectConflict</*0*/ test>()
internal final val some: kotlin.Int
internal final val some: kotlin.Int = 12.toInt()
internal final fun <get-some>(): kotlin.Int
internal class object <class-object-for-ConstructorTypeParamClassObjectConflict> {
/*primary*/ private constructor <class-object-for-ConstructorTypeParamClassObjectConflict>()
internal final val test: kotlin.Int
internal final val test: kotlin.Int = 12.toInt()
internal final fun <get-test>(): kotlin.Int
}
}
@@ -27,14 +27,14 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
internal final class TestClassObjectAndClassConflict {
/*primary*/ public constructor TestClassObjectAndClassConflict()
internal final val bla: kotlin.String
internal final val bla: kotlin.String = "More"
internal final fun <get-bla>(): kotlin.String
internal final val some: kotlin.String
internal final val some: kotlin.String = "More"
internal final fun <get-some>(): kotlin.String
internal class object <class-object-for-TestClassObjectAndClassConflict> {
/*primary*/ private constructor <class-object-for-TestClassObjectAndClassConflict>()
internal final val bla: kotlin.Int
internal final val bla: kotlin.Int = 12.toInt()
internal final fun <get-bla>(): kotlin.Int
}
}
@@ -46,7 +46,7 @@ internal final class TestConstructorParamClassObjectConflict {
internal class object <class-object-for-TestConstructorParamClassObjectConflict> {
/*primary*/ private constructor <class-object-for-TestConstructorParamClassObjectConflict>()
internal final val test: kotlin.Int
internal final val test: kotlin.Int = 12.toInt()
internal final fun <get-test>(): kotlin.Int
}
}
@@ -60,7 +60,7 @@ internal final class TestConstructorValClassObjectConflict {
internal class object <class-object-for-TestConstructorValClassObjectConflict> {
/*primary*/ private constructor <class-object-for-TestConstructorValClassObjectConflict>()
internal final val test: kotlin.Int
internal final val test: kotlin.Int = 12.toInt()
internal final fun <get-test>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
internal val x: kotlin.Int
internal val x: kotlin.Int = 5.toInt()
internal fun <get-x>(): kotlin.Int
public object Obj {
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt
+1 -1
View File
@@ -5,7 +5,7 @@ internal final class ClassObjectDeclaresProperty {
internal class object <class-object-for-ClassObjectDeclaresProperty> {
/*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
internal final val i: kotlin.Int
internal final val i: kotlin.Int = 1.toInt()
internal final fun <get-i>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt
+2 -2
View File
@@ -2,12 +2,12 @@ package test
internal final class A {
/*primary*/ public constructor A()
internal final val other: kotlin.Int
internal final val other: kotlin.Int = 1.toInt()
internal final fun <get-other>(): kotlin.Int
internal class object <class-object-for-A> {
/*primary*/ private constructor <class-object-for-A>()
internal final val some: kotlin.Int
internal final val some: kotlin.Int = 1.toInt()
internal final fun <get-some>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val aa: kotlin.Int
internal final val aa: kotlin.Int = 1.toInt()
internal final fun <get-aa>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
internal val nsVal: kotlin.Int
internal val nsVal: kotlin.Int = 1.toInt()
internal fun <get-nsVal>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.txt
+2 -2
View File
@@ -2,12 +2,12 @@ package test
internal open class BaseClass {
/*primary*/ public constructor BaseClass()
internal open val shape: kotlin.String
internal open val shape: kotlin.String = "square"
internal open fun <get-shape>(): kotlin.String
}
internal open class Subclass : test.BaseClass {
/*primary*/ public constructor Subclass()
internal open override /*1*/ val shape: kotlin.String
internal open override /*1*/ val shape: kotlin.String = "circle"
internal open override /*1*/ fun <get-shape>(): kotlin.String
}
compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
internal open class Subclass : test.Trait {
/*primary*/ public constructor Subclass()
internal open override /*1*/ val shape: kotlin.String
internal open override /*1*/ val shape: kotlin.String = "circle"
internal open override /*1*/ fun <get-shape>(): kotlin.String
}
compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
internal open class BaseClass {
/*primary*/ public constructor BaseClass()
internal final val exactly: kotlin.Int
internal final val exactly: kotlin.Int = 17.toInt()
internal final fun <get-exactly>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt
+2 -2
View File
@@ -2,9 +2,9 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val property1: kotlin.Int
internal final val property1: kotlin.Int = 1.toInt()
internal final fun <get-property1>(): kotlin.Int
internal final val property2: kotlin.Int
internal final val property2: kotlin.Int = 1.toInt()
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
+2 -2
View File
@@ -2,9 +2,9 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val property1: kotlin.Int
internal final val property1: kotlin.Int = 1.toInt()
internal final fun <get-property1>(): kotlin.Int
internal final val property2: kotlin.Int
internal final val property2: kotlin.Int = 1.toInt()
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
internal val x: kotlin.Int
internal val x: kotlin.Int = 0.toInt()
internal fun <get-x>(): kotlin.Int
internal fun f(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
private val topLevelVal: kotlin.Int
private val topLevelVal: kotlin.Int = 0.toInt()
private fun <get-topLevelVal>(): kotlin.Int