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

Rendering changed: "annotation class" is now just "class" (with kotlin.annotation.annotation if it's kotlin annotation).

Browse Source 
A swarm of tests fixed accordingly.
This commit is contained in:
Mikhail Glukhikh
2015-07-09 15:02:41 +03:00
parent 0d2a81f098
commit 37b2e97e56
236 changed files with 411 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
package test
test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
test.AnnotatedAnnotation() public final class AnnotatedAnnotation : kotlin.Annotation {
public constructor AnnotatedAnnotation()
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class AnnotatedConstructor {
test.AnnotatedConstructor.Anno(value = "constructor") public constructor AnnotatedConstructor()
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public open class AnnotatedField {
public constructor AnnotatedField()
test.AnnotatedField.Anno(value = "member") public final val y: kotlin.Int = 0
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public open class AnnotatedMethod {
public constructor AnnotatedMethod()
test.AnnotatedMethod.Anno(value = 42) public open fun f(): kotlin.Unit
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.Int)
public final val value: kotlin.Int
public abstract fun value(): kotlin.Int
compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public open class AnnotatedValueParameter {
public constructor AnnotatedValueParameter()
public open fun f(/*0*/ test.AnnotatedValueParameter.Anno(value = "non-empty") p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
Vendored
+6 -6
View File
@@ -14,19 +14,19 @@ public interface AnnotationInParam {
public constructor C()
}
public final annotation class MyAnnotation : kotlin.Annotation {
public final class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
}
public final annotation class MyAnnotation2 : kotlin.Annotation {
public final class MyAnnotation2 : kotlin.Annotation {
public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
public final val value: kotlin.Array<kotlin.String>
public abstract fun value(): kotlin.Array<kotlin.String>
}
public final annotation class MyAnnotation3 : kotlin.Annotation {
public final class MyAnnotation3 : kotlin.Annotation {
public constructor MyAnnotation3(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
public final val first: kotlin.String
public final val second: kotlin.String
@@ -34,19 +34,19 @@ public interface AnnotationInParam {
public abstract fun second(): kotlin.String
}
public final annotation class MyAnnotationWithParam : kotlin.Annotation {
public final class MyAnnotationWithParam : kotlin.Annotation {
public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation)
public final val value: test.AnnotationInParam.MyAnnotation
public abstract fun value(): test.AnnotationInParam.MyAnnotation
}
public final annotation class MyAnnotationWithParam2 : kotlin.Annotation {
public final class MyAnnotationWithParam2 : kotlin.Annotation {
public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2)
public final val value: test.AnnotationInParam.MyAnnotation2
public abstract fun value(): test.AnnotationInParam.MyAnnotation2
}
public final annotation class MyAnnotationWithParam3 : kotlin.Annotation {
public final class MyAnnotationWithParam3 : kotlin.Annotation {
public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3)
public final val value: test.AnnotationInParam.MyAnnotation3
public abstract fun value(): test.AnnotationInParam.MyAnnotation3
compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class ArithmeticExpressionInParam {
public constructor ArithmeticExpressionInParam()
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.Int)
public final val value: kotlin.Int
public abstract fun value(): kotlin.Int
compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface ArrayOfEnumInParam {
java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}) public final annotation class targetAnnotation : kotlin.Annotation {
java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}) public final class targetAnnotation : kotlin.Annotation {
public constructor targetAnnotation(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public interface ArrayOfStringInParam {
public constructor A()
}
public final annotation class MyAnnotation : kotlin.Annotation {
public final class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
public final val value: kotlin.Array<kotlin.String>
public abstract fun value(): kotlin.Array<kotlin.String>
compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class ClassObjectArrayInParam {
public constructor ClassObjectArrayInParam()
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class ClassObjectInParam {
public constructor ClassObjectInParam()
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>)
public final val value: kotlin.reflect.KClass<*>
public abstract fun value(): kotlin.reflect.KClass<*>
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class ClassObjectInParamRaw {
public constructor ClassObjectInParamRaw()
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
public final val value: kotlin.reflect.KClass<*>
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class ClassObjectInParamVariance {
public constructor ClassObjectInParamVariance()
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ arg1: kotlin.reflect.KClass<out kotlin.Int!>, /*1*/ arg2: kotlin.reflect.KClass<in kotlin.Int!>, /*2*/ arg3: kotlin.Array<kotlin.reflect.KClass<out kotlin.Int!>>, /*3*/ arg4: kotlin.Array<kotlin.reflect.KClass<in kotlin.Int!>>, /*4*/ arg5: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<*>!>>, /*5*/ arg6: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<*>!>>, /*6*/ arg7: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<kotlin.Int!>!>>, /*7*/ arg8: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<kotlin.Int!>!>>)
public final val arg1: kotlin.reflect.KClass<out kotlin.Int!>
public final val arg2: kotlin.reflect.KClass<in kotlin.Int!>
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface CustomAnnotation {
public final annotation class MyAnnotation : kotlin.Annotation {
public final class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)
public final val value: test.CustomAnnotation.MyEnum
public abstract fun value(): test.CustomAnnotation.MyEnum
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface CustomAnnotationWithDefaultParameter {
public final annotation class MyAnnotation : kotlin.Annotation {
public final class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...)
public final val first: kotlin.String
public final val second: kotlin.String
compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public interface EmptyArrayInParam {
public constructor A()
}
public final annotation class MyAnnotation : kotlin.Annotation {
public final class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
public final val value: kotlin.Array<kotlin.String>
public abstract fun value(): kotlin.Array<kotlin.String>
compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
Vendored
+2 -2
View File
@@ -22,13 +22,13 @@ public open class EnumArgumentWithCustomToString {
public final /*synthesized*/ fun values(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
}
public final annotation class EnumAnno : kotlin.Annotation {
public final class EnumAnno : kotlin.Annotation {
public constructor EnumAnno(/*0*/ value: test.EnumArgumentWithCustomToString.E)
public final val value: test.EnumArgumentWithCustomToString.E
public abstract fun value(): test.EnumArgumentWithCustomToString.E
}
public final annotation class EnumArrayAnno : kotlin.Annotation {
public final class EnumArrayAnno : kotlin.Annotation {
public constructor EnumArrayAnno(/*0*/ vararg value: test.EnumArgumentWithCustomToString.E /*kotlin.Array<out test.EnumArgumentWithCustomToString.E>*/)
public final val value: kotlin.Array<test.EnumArgumentWithCustomToString.E>
public abstract fun value(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
Vendored
+2 -2
View File
@@ -2,13 +2,13 @@ package test
public interface EnumInParam {
public final annotation class MyRetention : kotlin.Annotation {
public final class MyRetention : kotlin.Annotation {
public constructor MyRetention(/*0*/ value: java.lang.annotation.RetentionPolicy)
public final val value: java.lang.annotation.RetentionPolicy
public abstract fun value(): java.lang.annotation.RetentionPolicy
}
test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final annotation class RetentionAnnotation : kotlin.Annotation {
test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final class RetentionAnnotation : kotlin.Annotation {
public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public open class NestedEnumArgument {
public constructor NestedEnumArgument()
test.NestedEnumArgument.Anno(value = E.FIRST) public/*package*/ open fun foo(): kotlin.Unit
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: test.NestedEnumArgument.E)
public final val value: test.NestedEnumArgument.E
public abstract fun value(): test.NestedEnumArgument.E
compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public interface PrimitiveValueInParam {
public constructor A()
}
public final annotation class Ann : kotlin.Annotation {
public final class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ i: kotlin.Int, /*1*/ l: kotlin.Long, /*2*/ d: kotlin.Double, /*3*/ f: kotlin.Float, /*4*/ bool: kotlin.Boolean, /*5*/ str: kotlin.String)
public final val bool: kotlin.Boolean
public final val d: kotlin.Double
compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
Vendored
+2 -2
View File
@@ -2,13 +2,13 @@ package test
public interface RecursiveAnnotation {
test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class A : kotlin.Annotation {
test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final class A : kotlin.Annotation {
public constructor A(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
}
test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class B : kotlin.Annotation {
test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final class B : kotlin.Annotation {
public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
public final val value: test.RecursiveAnnotation.A
public abstract fun value(): test.RecursiveAnnotation.A
compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
Vendored
+2 -2
View File
@@ -2,13 +2,13 @@ package test
public interface RecursiveAnnotation2 {
public final annotation class A : kotlin.Annotation {
public final class A : kotlin.Annotation {
public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)
public final val value: test.RecursiveAnnotation2.B
public abstract fun value(): test.RecursiveAnnotation2.B
}
test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final annotation class B : kotlin.Annotation {
test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final class B : kotlin.Annotation {
public constructor B(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public final annotation class SimpleAnnotation : kotlin.Annotation {
public final class SimpleAnnotation : kotlin.Annotation {
public constructor SimpleAnnotation()
}
compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface StringConcatenationInParam {
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface StringConstantInParam {
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface StringInParam {
public final annotation class Anno : kotlin.Annotation {
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public final val value: kotlin.String
public abstract fun value(): kotlin.String