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/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<in A>>)
internal final val arg: kotlin.Array<kotlin.reflect.KClass<in A>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ internal final annotation class Ann1 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann2 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
public constructor Ann2(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<in B1>>)
internal final val arg: kotlin.Array<kotlin.reflect.KClass<in B1>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<out A>>)
internal final val arg: kotlin.Array<kotlin.reflect.KClass<out A>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ internal final annotation class Ann1 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann2 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
public constructor Ann2(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<out B1>>)
internal final val arg: kotlin.Array<kotlin.reflect.KClass<out B1>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
Vendored
+3 -3
View File
@@ -16,7 +16,7 @@ internal final class A2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass<*>)
internal final val arg: kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -24,7 +24,7 @@ internal final annotation class Ann1 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann2 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
public constructor Ann2(/*0*/ vararg arg: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
internal final val arg: kotlin.Array<out kotlin.reflect.KClass<*>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -32,7 +32,7 @@ internal final annotation class Ann2 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann3 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann3 : kotlin.Annotation {
public constructor Ann3(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
internal final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass<in A>)
internal final val arg: kotlin.reflect.KClass<in A>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ internal final annotation class Ann1 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann2 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
public constructor Ann2(/*0*/ arg: kotlin.reflect.KClass<in B1>)
internal final val arg: kotlin.reflect.KClass<in B1>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass<out A>)
internal final val arg: kotlin.reflect.KClass<out A>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ internal final annotation class Ann1 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann2 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
public constructor Ann2(/*0*/ arg: kotlin.reflect.KClass<out B1>)
internal final val arg: kotlin.reflect.KClass<out B1>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.reflect.KClass<A>)
internal final val arg: kotlin.reflect.KClass<A>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ internal final annotation class Ann1 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann2 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
public constructor Ann2(/*0*/ arg: kotlin.reflect.KClass<B>)
internal final val arg: kotlin.reflect.KClass<B>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class Ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
public constructor Ann1(/*0*/ arg: kotlin.Array<out kotlin.reflect.KClass<out A>>)
internal final val arg: kotlin.Array<out kotlin.reflect.KClass<out A>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean