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

Fix ConstantValue-related testData for loadJava tests

Browse Source
This commit is contained in:
Dmitry Petrov
2018-07-23 17:03:28 +03:00
parent cc1d9e88d5
commit 8f103dd8e5
79 changed files with 255 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt
Vendored
+1 -1
View File
@@ -3,6 +3,6 @@ package test
class ClassObjectDeclaresProperty {
companion object {
val i = 1
val i = { 1 }()
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class ClassObjectDeclaresProperty {
public companion object Companion {
/*primary*/ private constructor Companion()
public final val i: kotlin.Int = 1
public final val i: kotlin.Int
public final fun <get-i>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
class A {
companion object {
val some = 1
val some = { 1 }()
}
val other = some
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt
Vendored
+2 -2
View File
@@ -2,12 +2,12 @@ package test
public final class A {
/*primary*/ public constructor A()
public final val other: kotlin.Int = 1
public final val other: kotlin.Int
public final fun <get-other>(): kotlin.Int
public companion object Companion {
/*primary*/ private constructor Companion()
public final val some: kotlin.Int = 1
public final val some: kotlin.Int
public final fun <get-some>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt
Vendored
+8 -6
View File
@@ -5,27 +5,29 @@ class Test {
companion object {
public val prop1 : Int = 10
public val prop1 : Int = { 10 }()
public var prop2 : Int = 11
public var prop2 : Int = { 11 }()
protected set
public val prop3: Int = 12
public val prop3: Int = { 12 }()
get() {
return field
}
var prop4 : Int = 13
var prop4 : Int = { 13 }()
fun incProp4() {
prop4++
}
public var prop5 : Int = 14
public var prop5 : Int = { 14 }()
public var prop7 : Int = 20
public var prop7 : Int = { 20 }()
set(i: Int) {
field++
}
public const val constProp8: Int = 80
}
}
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt
Vendored
+4 -2
View File
@@ -5,12 +5,14 @@ public final class Test {
public companion object Companion {
/*primary*/ private constructor Companion()
public final val prop1: kotlin.Int = 10
public const final val constProp8: kotlin.Int = 80
public final fun <get-constProp8>(): kotlin.Int
public final val prop1: kotlin.Int
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 = 12
public final val prop3: kotlin.Int
public final fun <get-prop3>(): kotlin.Int
public final var prop4: kotlin.Int
public final fun <get-prop4>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt
Vendored
+8 -6
View File
@@ -5,27 +5,29 @@ interface Test {
companion object {
public val prop1 : Int = 10
public val prop1 : Int = { 10 }()
public var prop2 : Int = 11
public var prop2 : Int = { 11 }()
protected set
public val prop3: Int = 12
public val prop3: Int = { 12 }()
get() {
return field
}
var prop4 : Int = 13
var prop4 : Int = { 13 }()
fun incProp4() {
prop4++
}
public var prop5 : Int = 14
public var prop5 : Int = { 14 }()
public var prop7 : Int = 20
public var prop7 : Int = { 20 }()
set(i: Int) {
field++
}
public const val constProp8: Int = 80
}
}
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt
Vendored
+4 -2
View File
@@ -4,12 +4,14 @@ public interface Test {
public companion object Companion {
/*primary*/ private constructor Companion()
public final val prop1: kotlin.Int = 10
public const final val constProp8: kotlin.Int = 80
public final fun <get-constProp8>(): kotlin.Int
public final val prop1: kotlin.Int
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 = 12
public final val prop3: kotlin.Int
public final fun <get-prop3>(): kotlin.Int
public final var prop4: kotlin.Int
public final fun <get-prop4>(): kotlin.Int