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

"annotation" is now parsed as an identifier. It is no longer a soft keyword.

Browse Source 
Sometimes it's allowed to parse "annotation" unescaped even if other annotations must be escaped.
A set of annotations and their options tests.
A swarm of existing tests fixed (mostly kotlin.annotation.annotation() added to txt-files).
STUB_VERSION increased. Some quick fixes slightly changed.
This commit is contained in:
Mikhail Glukhikh
2015-06-26 16:30:20 +03:00
parent 7a6e5f66bd
commit 1eac4d67de
231 changed files with 1915 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
Vendored
+3 -3
View File
@@ -22,13 +22,13 @@ internal final enum class E : kotlin.Enum<test.E> {
public final /*synthesized*/ fun values(): kotlin.Array<test.E>
}
internal final annotation class EnumOption : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class EnumOption : kotlin.Annotation {
/*primary*/ public constructor EnumOption(/*0*/ option: test.E)
internal final val option: test.E
internal final fun <get-option>(): test.E
}
internal final annotation class OptionGroups : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class OptionGroups : kotlin.Annotation {
/*primary*/ public constructor OptionGroups(/*0*/ o1: test.StringOptions, /*1*/ o2: test.EnumOption)
internal final val o1: test.StringOptions
internal final fun <get-o1>(): test.StringOptions
@@ -36,7 +36,7 @@ internal final annotation class OptionGroups : kotlin.Annotation {
internal final fun <get-o2>(): test.EnumOption
}
internal final annotation class StringOptions : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class StringOptions : kotlin.Annotation {
/*primary*/ public constructor StringOptions(/*0*/ vararg option: kotlin.String /*kotlin.Array<out kotlin.String>*/)
internal final val option: kotlin.Array<out kotlin.String>
internal final fun <get-option>(): kotlin.Array<out kotlin.String>