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

Private visibility for non-const, non-jvmField class companion property backing field

Browse Source
This commit is contained in:
Michael Bogdanov
2015-12-25 15:05:31 +03:00
parent 85ae0cb78e
commit e116cc3206
76 changed files with 299 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
Vendored
+1 -4
View File
@@ -1,9 +1,6 @@
public final class ClassObjectField {
/**
* @deprecated
*/
@org.jetbrains.annotations.Nullable
public static final java.lang.String x = "";
private static final java.lang.String x = "";
private static final java.lang.String y = "";
public static final ClassObjectField.Companion Companion;
compiler/testData/asJava/lightClasses/object/SimpleObject.java
Vendored
+2 -8
View File
@@ -1,13 +1,7 @@
public final class A {
/**
* @deprecated
*/
public static final int c = 1;
/**
* @deprecated
*/
private static final int c = 1;
@org.jetbrains.annotations.NotNull
public static java.lang.String v;
private static java.lang.String v;
public static final pack.A INSTANCE;
public final int getC() { /* compiled code */ }
compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/Test.java
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@ class Test {
return A.foo;
}
public static String bar() {
return A.bar;
public static String constBar() {
return A.constBar;
}
public static String getBar() {
compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/enumCompanionObject.kt
Vendored
+4 -2
View File
@@ -3,7 +3,9 @@ import kotlin.jvm.JvmStatic
enum class A {
;
companion object {
val foo: String = "OK"
@JvmField val foo: String = "OK"
const val constBar: String = "OK"
@JvmStatic val bar: String = "OK"
@@ -13,7 +15,7 @@ enum class A {
fun box(): String {
if (Test.foo() != "OK") return "Fail foo"
if (Test.bar() != "OK") return "Fail bar"
if (Test.constBar() != "OK") return "Fail bar"
if (Test.getBar() != "OK") return "Fail getBar"
if (Test.baz() != "OK") return "Fail baz"
return "OK"
compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty/kotlinClass.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
class KotlinClass {
companion object {
val FOO_INT: Int = 10
val FOO_STRING: String = "OK"
const val FOO_INT: Int = 10
@JvmField val FOO_STRING: String = "OK"
}
}
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/Test.java
Vendored
+6
View File
@@ -5,12 +5,18 @@ class Test {
s = Klass.NAME;
if (!s.equals("Klass")) throw new AssertionError("Fail class: " + s);
s = Klass.JVM_NAME;
if (!s.equals("JvmKlass")) throw new AssertionError("Fail jvm class: " + s);
s = Trait.NAME;
if (!s.equals("Trait")) throw new AssertionError("Fail interface: " + s);
s = Enoom.NAME;
if (!s.equals("Enum")) throw new AssertionError("Fail enum: " + s);
s = Enoom.JVM_NAME;
if (!s.equals("JvmEnum")) throw new AssertionError("Fail jvm enum: " + s);
return "OK";
}
}
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt
Vendored
+3 -1
View File
@@ -1,6 +1,7 @@
class Klass {
companion object {
val NAME = "Klass"
const val NAME = "Klass"
@JvmField val JVM_NAME = "JvmKlass"
}
}
@@ -14,6 +15,7 @@ enum class Enoom {
;
companion object {
const val NAME = "Enum"
@JvmField val JVM_NAME = "JvmEnum"
}
}
compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public interface ErrorsJvmTrait {
public class ErrorsJvmClass {
companion object {
public val param : G<String> = G("STRING")
@JvmField public val param : G<String> = G("STRING")
}
}
compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt
Vendored
+7 -7
View File
@@ -11,13 +11,13 @@ annotation class AFloat(val value: Float)
class Test {
companion object {
val vstring: String = "Test"
val vchar: Char = 'c'
val vint: Int = 10
val vbyte: Byte = 11
val vlong: Long = 12
val vdouble: Double = 1.2
val vfloat: Float = 1.3.toFloat()
const val vstring: String = "Test"
const val vchar: Char = 'c'
const val vint: Int = 10
const val vbyte: Byte = 11
const val vlong: Long = 12
const val vdouble: Double = 1.2
const val vfloat: Float = 1.3.toFloat()
}
}
compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt
Vendored
+7 -7
View File
@@ -44,12 +44,12 @@ public final class Test {
public companion object Companion {
private constructor Companion()
public final val vbyte: kotlin.Byte
public final val vchar: kotlin.Char
public final val vdouble: kotlin.Double
public final val vfloat: kotlin.Float
public final val vint: kotlin.Int
public final val vlong: kotlin.Long
public final val vstring: kotlin.String
public const final val vbyte: kotlin.Byte
public const final val vchar: kotlin.Char
public const final val vdouble: kotlin.Double
public const final val vfloat: kotlin.Float
public const final val vint: kotlin.Int
public const final val vlong: kotlin.Long
public const final val vstring: kotlin.String
}
}
compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ package test
class KotlinClass {
companion object {
val FOO: Int = 10
const val FOO: Int = 10
}
}
compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class KotlinClass {
public companion object Companion {
private constructor Companion()
public final val FOO: kotlin.Int
public const final val FOO: kotlin.Int
}
}
compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@ package test
class Test {
companion object {
public val valProp: Int = 10
public const val valProp: Int = 10
public var varProp: Int = 10
@JvmField public var varProp: Int = 10
}
}
compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.txt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ public final class Test {
public companion object Companion {
private constructor Companion()
public final val valProp: kotlin.Int
public final var varProp: kotlin.Int
public const final val valProp: kotlin.Int
@field:kotlin.jvm.JvmField() public final var varProp: kotlin.Int
}
}
compiler/testData/writeFlags/property/classObject/class/internalVal.kt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
class Test {
companion object {
var prop: Int = 0;
const val prop: Int = 0;
}
}
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/internalVar.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/protectedVal.kt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
class Test {
companion object {
protected val prop: Int = 0;
const protected val prop: Int = 0;
}
}
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_FINAL, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVal.kt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
class Test {
companion object {
public val prop: Int = 0;
public const val prop: Int = 0;
}
}
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVar.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ class Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ class Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PRIVATE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
class Test(val prop: String) {
companion object {
public val prop : String = "CO";
public const val prop : String = "CO";
}
}
@@ -13,4 +13,4 @@ class Test(val prop: String) {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ class Test {
public var prop: Int = 0;
companion object {
public val prop: Int = 0;
public const val prop: Int = 0;
}
}
@@ -13,4 +13,4 @@ class Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/internalVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/protectedConstVal.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
interface Test {
companion object {
protected const val prop: Int = 0
}
}
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// ABSENT: TRUE
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PROTECTED, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PROTECTED, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PROTECTED, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_DEPRECATED
// FLAGS: ACC_PRIVATE, ACC_STATIC