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

Deprecate some of JVM flag annotations in favor of capitilized themselves

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-04 14:21:10 +03:00
parent 2b76941733
commit 26f9bd7b63
21 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
+4 -4
View File
@@ -60,13 +60,13 @@ public abstract class AnnotationCodegen {
} }
public static final List<JvmFlagAnnotation> FIELD_FLAGS = Arrays.asList( public static final List<JvmFlagAnnotation> FIELD_FLAGS = Arrays.asList(
new JvmFlagAnnotation("kotlin.jvm.volatile", Opcodes.ACC_VOLATILE), new JvmFlagAnnotation("kotlin.jvm.Volatile", Opcodes.ACC_VOLATILE),
new JvmFlagAnnotation("kotlin.jvm.transient", Opcodes.ACC_TRANSIENT) new JvmFlagAnnotation("kotlin.jvm.Transient", Opcodes.ACC_TRANSIENT)
); );
public static final List<JvmFlagAnnotation> METHOD_FLAGS = Arrays.asList( public static final List<JvmFlagAnnotation> METHOD_FLAGS = Arrays.asList(
new JvmFlagAnnotation("kotlin.jvm.strictfp", Opcodes.ACC_STRICT), new JvmFlagAnnotation("kotlin.jvm.Strictfp", Opcodes.ACC_STRICT),
new JvmFlagAnnotation("kotlin.jvm.synchronized", Opcodes.ACC_SYNCHRONIZED), new JvmFlagAnnotation("kotlin.jvm.Synchronized", Opcodes.ACC_SYNCHRONIZED),
new JvmFlagAnnotation("kotlin.jvm.native", Opcodes.ACC_NATIVE) new JvmFlagAnnotation("kotlin.jvm.native", Opcodes.ACC_NATIVE)
); );
compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
class C { class C {
volatile var vol = 1 @Volatile var vol = 1
transient val tra = 1 @Transient val tra = 1
strictfp fun str() {} @Strictfp fun str() {}
synchronized fun sync() {} @Synchronized fun sync() {}
} }
fun box(): String { fun box(): String {
compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt
Vendored
+8 -8
View File
@@ -1,10 +1,10 @@
volatile var vol = 1 @Volatile var vol = 1
transient val tra = 1 @Transient val tra = 1
strictfp fun str() {} @Strictfp fun str() {}
synchronized fun sync() {} @Synchronized fun sync() {}
// 0 kotlin/jvm/volatile // 0 kotlin/jvm/Volatile
// 0 kotlin/jvm/transient // 0 kotlin/jvm/Transient
// 0 kotlin/jvm/strictfp // 0 kotlin/jvm/Strictfp
// 0 kotlin/jvm/synchronized // 0 kotlin/jvm/Synchronized
compiler/testData/psi/DocCommentAfterFileAnnotations.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@file:[volatile] @file:[Volatile]
/** /**
* Doc comment * Doc comment
*/ */
compiler/testData/psi/DocCommentAfterFileAnnotations.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ JetFile: DocCommentAfterFileAnnotations.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PACKAGE_DIRECTIVE PACKAGE_DIRECTIVE
<empty list> <empty list>
compiler/testData/psi/LineCommentAfterFileAnnotations.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
@file:[volatile] @file:[Volatile]
// class C // class C
class C{} class C{}
compiler/testData/psi/LineCommentAfterFileAnnotations.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ JetFile: LineCommentAfterFileAnnotations.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PACKAGE_DIRECTIVE PACKAGE_DIRECTIVE
<empty list> <empty list>
compiler/testData/psi/annotation/at/declarationsJustAtTyped.kt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ private @ @[Ann1(1)] Ann3("2") class A(
@[Ann] @[Ann]
private private
@ @
@volatile var x = 1 @Volatile var x = 1
foo(fun(@ @ann(1) x: Int) {}) foo(fun(@ @ann(1) x: Int) {})
compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
Vendored
+1 -1
View File
@@ -193,7 +193,7 @@ JetFile: declarationsJustAtTyped.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(var)('var') PsiElement(var)('var')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
compiler/testData/psi/annotation/at/validDeclarations.kt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
private @open @[Ann1(1)] @Ann2("1") Ann3("2") class A( private @open @[Ann1(1)] @Ann2("1") Ann3("2") class A(
@volatile(1) private val x: @AnnType("3") @open Int, @Volatile(1) private val x: @AnnType("3") @open Int,
@private var y: Int, @private var y: Int,
@open z: Int @open z: Int
) { ) {
@@ -16,7 +16,7 @@ private @open @[Ann1(1)] @Ann2("1") Ann3("2") class A(
@[Ann] @[Ann]
private private
@abstract @abstract
@volatile var x = 1 @Volatile var x = 1
foo(fun(@vararg @ann(1) x: Int) {}) foo(fun(@vararg @ann(1) x: Int) {})
} }
@@ -43,5 +43,5 @@ private @open @[Ann1(1)] @Ann2("1") Ann3("2") class A(
fun bar() { fun bar() {
try {} try {}
catch (@volatile e: Exception) {} catch (@Volatile e: Exception) {}
} }
compiler/testData/psi/annotation/at/validDeclarations.txt
Vendored
+3 -3
View File
@@ -74,7 +74,7 @@ JetFile: validDeclarations.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
@@ -292,7 +292,7 @@ JetFile: validDeclarations.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(var)('var') PsiElement(var)('var')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -570,7 +570,7 @@ JetFile: validDeclarations.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('e') PsiElement(IDENTIFIER)('e')
PsiElement(COLON)(':') PsiElement(COLON)(':')
compiler/testData/psi/annotation/forParameters.kt
Vendored
+9 -9
View File
@@ -1,5 +1,5 @@
fun foo() { fun foo() {
for (@volatile x in z) {} for (@Volatile x in z) {}
for (@[ann]) {} for (@[ann]) {}
for (@ in z) {} for (@ in z) {}
@@ -8,14 +8,14 @@ fun foo() {
for ((@[ann], x) in pair) {} for ((@[ann], x) in pair) {}
for (volatile x in 1..100) {} for (Volatile x in 1..100) {}
for (volatile(1) x in 1..100) {} for (Volatile(1) x in 1..100) {}
for (volatile() (x, volatile y) in 1..100) {} for (Volatile() (x, Volatile y) in 1..100) {}
for (volatile (x, volatile y) in 1..100) {} for (Volatile (x, Volatile y) in 1..100) {}
for (volatile var x in 1..100) {} for (Volatile var x in 1..100) {}
for (volatile val (x, volatile y) in 1..100) {} for (Volatile val (x, Volatile y) in 1..100) {}
for (private volatile var x in 1..100) {} for (private Volatile var x in 1..100) {}
for (private volatile val (x, volatile y) in 1..100) {} for (private Volatile val (x, Volatile y) in 1..100) {}
} }
compiler/testData/psi/annotation/forParameters.txt
Vendored
+13 -13
View File
@@ -26,7 +26,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -199,7 +199,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x') PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -231,7 +231,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
@@ -269,7 +269,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
@@ -286,7 +286,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('y') PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
@@ -319,7 +319,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY MULTI_VARIABLE_DECLARATION_ENTRY
@@ -333,7 +333,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('y') PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
@@ -366,7 +366,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(var)('var') PsiElement(var)('var')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -400,7 +400,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -416,7 +416,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('y') PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
@@ -451,7 +451,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(var)('var') PsiElement(var)('var')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -487,7 +487,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -503,7 +503,7 @@ JetFile: forParameters.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('y') PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
compiler/testData/psi/annotation/multiDeclaration.kt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@ fun foo() {
val (x, private data @ann @[ann] y) = pair val (x, private data @ann @[ann] y) = pair
val (@[ann], x) = pair val (@[ann], x) = pair
@volatile val (@ann x, y) = 1 @Volatile val (@ann x, y) = 1
@volatile val (@ann x, y = 1 @Volatile val (@ann x, y = 1
} }
compiler/testData/psi/annotation/multiDeclaration.txt
Vendored
+2 -2
View File
@@ -97,7 +97,7 @@ JetFile: multiDeclaration.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -132,7 +132,7 @@ JetFile: multiDeclaration.kt
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('volatile') PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package to package to
volatile var field = 1 Volatile var field = 1
j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt
+4 -4
View File
@@ -90,10 +90,10 @@ class AnnotationConverter(private val converter: Converter) {
} }
private val MODIFIER_TO_ANNOTATION = listOf( private val MODIFIER_TO_ANNOTATION = listOf(
PsiModifier.SYNCHRONIZED to "synchronized", PsiModifier.SYNCHRONIZED to "Synchronized",
PsiModifier.VOLATILE to "volatile", PsiModifier.VOLATILE to "Volatile",
PsiModifier.STRICTFP to "strictfp", PsiModifier.STRICTFP to "Strictfp",
PsiModifier.TRANSIENT to "transient" PsiModifier.TRANSIENT to "Transient"
) )
private fun mapTargetByName(expr: PsiReferenceExpression): Set<KotlinTarget> { private fun mapTargetByName(expr: PsiReferenceExpression): Set<KotlinTarget> {
j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
class A { class A {
deprecated("") deprecated("")
volatile var field1 = 0 Volatile var field1 = 0
transient var field2 = 1 Transient var field2 = 1
strictfp var field3 = 2.0 Strictfp var field3 = 2.0
} }
j2k/testData/fileOrElement/function/synchronizedMethod.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
class A { class A {
synchronized fun foo() { Synchronized fun foo() {
bar() bar()
} }
j2k/testData/fileOrElement/overloads/Synchronized.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
println("p = [$p]") println("p = [$p]")
} }
synchronized public fun foo() { Synchronized public fun foo() {
foo(calcSomething()) foo(calcSomething())
} }
libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt
+4 -4
View File
@@ -23,14 +23,14 @@ import kotlin.annotation.AnnotationTarget.*
* are immediately made visible to other threads. * are immediately made visible to other threads.
*/ */
target(FIELD) target(FIELD)
public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class volatile public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class Volatile
/** /**
* Marks the JVM backing field of the annotated property as `transient`, meaning that it is not * Marks the JVM backing field of the annotated property as `transient`, meaning that it is not
* part of the default serialized form of the object. * part of the default serialized form of the object.
*/ */
target(FIELD) target(FIELD)
public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class transient public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class Transient
/** /**
* Marks the JVM method generated from the annotated function as `strictfp`, meaning that the precision * Marks the JVM method generated from the annotated function as `strictfp`, meaning that the precision
@@ -38,7 +38,7 @@ public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = tru
* achieve better portability. * achieve better portability.
*/ */
target(FUNCTION, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER, CLASSIFIER) target(FUNCTION, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER, CLASSIFIER)
public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class strictfp public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class Strictfp
/** /**
* Marks the JVM method generated from the annotated function as `synchronized`, meaning that the method * Marks the JVM method generated from the annotated function as `synchronized`, meaning that the method
@@ -46,7 +46,7 @@ public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = tru
* for static methods, the class) on which the method is defined. * for static methods, the class) on which the method is defined.
*/ */
target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class synchronized public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class Synchronized
/** /**
* Marks the JVM method generated from the annotated function as `native`, meaning that it's not implemented * Marks the JVM method generated from the annotated function as `native`, meaning that it's not implemented