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

Load static final fields of appropriate types from Java as const

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-21 17:32:17 +03:00
parent 98dd08109d
commit 8d13f08271
14 changed files with 94 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt
Vendored
+1 -1
View File
@@ -11,5 +11,5 @@ public open class AnnotatedField {
}
// Static members
@test.AnnotatedField.Anno(value = "static") public final val x: kotlin.Int = 0
@test.AnnotatedField.Anno(value = "static") public const final val x: kotlin.Int = 0
}
compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
Vendored
+1 -1
View File
@@ -13,5 +13,5 @@ public interface StringConstantInParam {
}
// Static members
public final val HEL: kotlin.String = "hel"
public const final val HEL: kotlin.String = "hel"
}
compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
Vendored
+6 -6
View File
@@ -4,10 +4,10 @@ public open class StaticFinal {
public constructor StaticFinal()
// Static members
public/*package*/ final val packageNonNull: kotlin.String = "bbb"
public/*package*/ final val packageNull: kotlin.String!
private final val privateNonNull: kotlin.String = "bbb"
private final val privateNull: kotlin.String!
public final val publicNonNull: kotlin.String = "aaa"
public final val publicNull: kotlin.String!
public/*package*/ const final val packageNonNull: kotlin.String = "bbb"
public/*package*/ const final val packageNull: kotlin.String!
private const final val privateNonNull: kotlin.String = "bbb"
private const final val privateNull: kotlin.String!
public const final val publicNonNull: kotlin.String = "aaa"
public const final val publicNull: kotlin.String!
}