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/ClassObjectAnnotatedWithItsKClass.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
package test {
internal final annotation class AnnClass : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class AnnClass : kotlin.Annotation {
public constructor AnnClass(/*0*/ a: kotlin.reflect.KClass<*>)
internal final val a: kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ internal val i3: kotlin.Int
internal val iAnn: Ann
internal fun foo(): kotlin.Int
internal final annotation class Ann : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ i: kotlin.IntArray)
internal final val i: kotlin.IntArray
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,7 +14,7 @@ internal final annotation class Ann : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class AnnAnn : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class AnnAnn : kotlin.Annotation {
public constructor AnnAnn(/*0*/ i: kotlin.Array<Ann>)
internal final val i: kotlin.Array<Ann>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
Vendored
+4 -4
View File
@@ -6,7 +6,7 @@ internal val ia: kotlin.IntArray
internal val sa: kotlin.Array<kotlin.String>
internal fun foo(): kotlin.Int
internal final annotation class Ann : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ i: kotlin.Int)
internal final val i: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,14 +14,14 @@ internal final annotation class Ann : 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()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class AnnIA : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class AnnIA : kotlin.Annotation {
public constructor AnnIA(/*0*/ ia: kotlin.IntArray)
internal final val ia: kotlin.IntArray
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -29,7 +29,7 @@ internal final annotation class AnnIA : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class AnnSA : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class AnnSA : kotlin.Annotation {
public constructor AnnSA(/*0*/ sa: kotlin.Array<kotlin.String>)
internal final val sa: kotlin.Array<kotlin.String>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ internal val i3: kotlin.Int
internal val iAnn: Ann
internal fun foo(): kotlin.Int
internal final annotation class Ann : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/)
internal final val i: kotlin.IntArray
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,7 +14,7 @@ internal final annotation class Ann : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class AnnAnn : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class AnnAnn : kotlin.Annotation {
public constructor AnnAnn(/*0*/ vararg i: Ann /*kotlin.Array<out Ann>*/)
internal final val i: kotlin.Array<out Ann>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
B(args = {IntegerValueType(1), "b"}) internal fun test(): kotlin.Unit
internal final annotation class B : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
public constructor B(/*0*/ vararg args: kotlin.String /*kotlin.Array<out kotlin.String>*/)
internal final val args: kotlin.Array<out kotlin.String>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ internal val nonConst: kotlin.Int
internal val nonConstKClass: kotlin.reflect.KClass<kotlin.String>
internal fun foo(): kotlin.Int
internal final annotation class InvalidAnn : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class InvalidAnn : kotlin.Annotation {
public constructor InvalidAnn(/*0*/ p1: kotlin.Int = ..., /*1*/ p2: kotlin.Int = ..., /*2*/ p3: kotlin.reflect.KClass<*> = ...)
internal final val p1: kotlin.Int
internal final val p2: kotlin.Int
@@ -15,7 +15,7 @@ internal final annotation class InvalidAnn : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class ValidAnn : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class ValidAnn : kotlin.Annotation {
public constructor ValidAnn(/*0*/ p1: kotlin.Int = ..., /*1*/ p2: kotlin.String = ..., /*2*/ p3: kotlin.reflect.KClass<*> = ..., /*3*/ p4: kotlin.IntArray = ..., /*4*/ p5: kotlin.Array<kotlin.String> = ..., /*5*/ p6: kotlin.Array<kotlin.reflect.KClass<*>> = ...)
internal final val p1: kotlin.Int
internal final val p2: kotlin.String
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
compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ Ann(value = "a", x = IntegerValueType(1), y = 1.0.toDouble()) internal fun foo1(
Ann(value = "b", x = IntegerValueType(2), y = 2.0.toDouble()) internal fun foo2(): kotlin.Unit
Ann(value = "c", x = IntegerValueType(3), y = 2.0.toDouble()) internal fun foo3(): kotlin.Unit
internal final annotation class Ann : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ value: kotlin.String, /*2*/ y: kotlin.Double)
internal final val value: kotlin.String
internal final val x: kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
Vendored
+5 -5
View File
@@ -13,7 +13,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal final annotation class IAnn : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class IAnn : kotlin.Annotation {
public constructor IAnn()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,7 +21,7 @@ package a {
}
}
internal final annotation class ann1 : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class ann1 : kotlin.Annotation {
public constructor ann1(/*0*/ p: kotlin.deprecated = ...)
internal final val p: kotlin.deprecated
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -29,7 +29,7 @@ package a {
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*/ p: a.b.c.ann1 = ...)
internal final val p: a.b.c.ann1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,7 +37,7 @@ package a {
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*/ p: a.b.c.A.IAnn = ..., /*1*/ p2: a.b.c.A.IAnn = ...)
internal final val p: a.b.c.A.IAnn
internal final val p2: a.b.c.A.IAnn
@@ -46,7 +46,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final annotation class annArray : kotlin.Annotation {
kotlin.annotation.annotation() internal final annotation class annArray : kotlin.Annotation {
public constructor annArray(/*0*/ p: kotlin.Array<kotlin.String> = ...)
internal final val p: kotlin.Array<kotlin.String>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean