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

StorageManager for compile-time initializer

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-02-12 19:59:35 +04:00
parent 17259a052e
commit df3ed5059c
27 changed files with 75 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
trait test
}
val some: test? = null
val some: test? = throw Exception()
}
class ConstructorTypeParamClassObjectConflict<test> {
compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String
public final val v: kotlin.String = "val"
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt
+1 -1
View File
@@ -5,7 +5,7 @@ public final class Outer {
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String
public final val v: kotlin.String = "val"
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Outer {
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String
public final val v: kotlin.String = "val"
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt
+1 -1
View File
@@ -9,7 +9,7 @@ public object Outer {
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String
public final val v: kotlin.String = "val"
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+1 -1
View File
@@ -5,7 +5,7 @@ internal val x: kotlin.Int = 5.toInt()
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String
public final val v: kotlin.String = "val"
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt
+2 -2
View File
@@ -5,12 +5,12 @@ internal final class Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final val prop1: kotlin.Int
public final val prop1: kotlin.Int = 10.toInt()
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
public final fun <get-prop2>(): kotlin.Int
protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public final val prop3: kotlin.Int
public final val prop3: kotlin.Int = 12.toInt()
public final fun <get-prop3>(): kotlin.Int
internal final var prop4: kotlin.Int
internal final fun <get-prop4>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt
+2 -2
View File
@@ -4,12 +4,12 @@ internal trait Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final val prop1: kotlin.Int
public final val prop1: kotlin.Int = 10.toInt()
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
public final fun <get-prop2>(): kotlin.Int
protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public final val prop3: kotlin.Int
public final val prop3: kotlin.Int = 12.toInt()
public final fun <get-prop3>(): kotlin.Int
internal final var prop4: kotlin.Int
internal final fun <get-prop4>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt
+2 -2
View File
@@ -8,8 +8,8 @@ internal final class ClassVal {
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
protected final val property4: kotlin.String
protected final val property4: kotlin.String = ""
protected final fun <get-property4>(): kotlin.String
public final val property5: kotlin.Int
public final val property5: kotlin.Int = 1.toInt()
public final fun <get-property5>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
+2 -2
View File
@@ -8,8 +8,8 @@ internal final class ClassVal {
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
protected final val property4: kotlin.String
protected final val property4: kotlin.String = ""
protected final fun <get-property4>(): kotlin.String
public final val property5: kotlin.Int
public final val property5: kotlin.Int = 1.toInt()
public final fun <get-property5>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
+1 -1
View File
@@ -14,7 +14,7 @@ internal final class B : test.A {
public open override /*1*/ var p: kotlin.Int
public open override /*1*/ fun <get-p>(): kotlin.Int
public open override /*1*/ fun <set-p>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
internal open override /*1*/ val v: kotlin.Int
internal open override /*1*/ val v: kotlin.Int = 0.toInt()
internal open override /*1*/ fun <get-v>(): kotlin.Int
internal open override /*1*/ fun f(): kotlin.Int
}