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

Regenerate test data on enums

Browse Source 
Now they have final equals, hashCode and compareTo
This commit is contained in:
Alexander Udalov
2014-10-16 22:33:41 +04:00
parent 624e507ec2
commit 6ddc063a76
96 changed files with 2788 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/EnumMembers.txt
+11 -6
View File
@@ -3,43 +3,48 @@ package test
public final enum class EnumMembers : kotlin.Enum<test.EnumMembers!> {
private constructor EnumMembers(/*0*/ p0: kotlin.Boolean)
public final val isFirst: kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
public open fun first(): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public enum entry FIRST : test.EnumMembers {
private constructor FIRST()
public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-FIRST> : test.EnumMembers.FIRST {
private constructor <class-object-for-FIRST>()
public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
public enum entry SECOND : test.EnumMembers {
private constructor SECOND()
public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-SECOND> : test.EnumMembers.SECOND {
private constructor <class-object-for-SECOND>()
public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
}
}
compiler/testData/loadJava/compiledJava/JavaEnum.txt
+11 -6
View File
@@ -2,34 +2,39 @@ package test
public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
private constructor JavaEnum()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public enum entry ANOTHER : test.JavaEnum {
private constructor ANOTHER()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-ANOTHER> : test.JavaEnum.ANOTHER {
private constructor <class-object-for-ANOTHER>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
public enum entry ENTRY : test.JavaEnum {
private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-ENTRY> : test.JavaEnum.ENTRY {
private constructor <class-object-for-ENTRY>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
}
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+10 -7
View File
@@ -1,35 +1,38 @@
package test
public trait CustomAnnotation {
public final annotation class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)
public abstract fun value(): test.CustomAnnotation.MyEnum
}
public final enum class MyEnum : kotlin.Enum<test.CustomAnnotation.MyEnum!> {
private constructor MyEnum()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public enum entry ONE : test.CustomAnnotation.MyEnum {
private constructor ONE()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-ONE> : test.CustomAnnotation.MyEnum.ONE {
private constructor <class-object-for-ONE>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
}
test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {
public constructor MyTest()
}
}
}
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
+9 -6
View File
@@ -3,31 +3,34 @@ package test
public open class NestedEnumArgument {
public constructor NestedEnumArgument()
test.NestedEnumArgument.Anno(value = E.FIRST: test.NestedEnumArgument.E) public/*package*/ open fun foo(): kotlin.Unit
public/*package*/ final annotation class Anno : kotlin.Annotation {
public/*package*/ constructor Anno(/*0*/ value: test.NestedEnumArgument.E)
public abstract fun value(): test.NestedEnumArgument.E
}
public final enum class E : kotlin.Enum<test.NestedEnumArgument.E!> {
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public enum entry FIRST : test.NestedEnumArgument.E {
private constructor FIRST()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-FIRST> : test.NestedEnumArgument.E.FIRST {
private constructor <class-object-for-FIRST>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.NestedEnumArgument.E
public final /*synthesized*/ fun values(): kotlin.Array<test.NestedEnumArgument.E>
}
}
}
compiler/testData/loadJava/compiledJava/static/Enum.txt
+17 -10
View File
@@ -2,58 +2,65 @@ package test
public final enum class Enum : kotlin.Enum<test.Enum!> {
private constructor Enum()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public enum entry A : test.Enum {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-A> : test.Enum.A {
private constructor <class-object-for-A>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
public enum entry B : test.Enum {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-B> : test.Enum.B {
private constructor <class-object-for-B>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
public enum entry C : test.Enum {
private constructor C()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-C> : test.Enum.C {
private constructor <class-object-for-C>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
public open inner class Inner {
public constructor Inner()
public/*package*/ open fun bar(): kotlin.Unit
public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String!): kotlin.Unit
}
public open class Nested {
public constructor Nested()
public/*package*/ open fun foo(): kotlin.Unit
public/*package*/ open fun values(): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
}
}
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+7 -4
View File
@@ -2,21 +2,24 @@ package test
public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEnum!> {
private constructor StaticMembersInEnum()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.StaticMembersInEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public enum entry ENTRY : test.StaticMembersInEnum {
private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.StaticMembersInEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-ENTRY> : test.StaticMembersInEnum.ENTRY {
private constructor <class-object-for-ENTRY>()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.StaticMembersInEnum!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
// Static members
public final val CONSTANT: test.StaticMembersInEnum!
public final var STATIC_FIELD: kotlin.Int
@@ -25,4 +28,4 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
public open fun values(/*0*/ p0: kotlin.Int): kotlin.Unit
}
}