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

Stdlib rename: 'name' and 'ordinal' are now properties in Enum, same name functions are deprecated

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-12 17:52:55 +03:00
parent 78cfeb0d7d
commit f8a356747e
193 changed files with 522 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
Vendored
+2 -2
View File
@@ -12,10 +12,10 @@ public interface CustomAnnotation {
enum entry ONE
private constructor MyEnum()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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
compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
Vendored
+2 -2
View File
@@ -8,10 +8,10 @@ public open class EnumArgumentWithCustomToString {
enum entry CAKE
private constructor E()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.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.EnumArgumentWithCustomToString.E
compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
Vendored
+2 -2
View File
@@ -5,10 +5,10 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
private constructor EnumConstructorParameter(/*0*/ p0: kotlin.Int)
private constructor EnumConstructorParameter(/*0*/ @test.EnumConstructorParameter.Anno(value = "string") p0: kotlin.String!)
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumConstructorParameter!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public final class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
Vendored
+2 -2
View File
@@ -14,10 +14,10 @@ public open class NestedEnumArgument {
enum entry FIRST
private constructor E()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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
compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
Vendored
+2 -2
View File
@@ -7,11 +7,11 @@ 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*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
Vendored
+2 -2
View File
@@ -6,10 +6,10 @@ public open enum class EnumWithSpecializedEntry : kotlin.Enum<test.EnumWithSpeci
enum entry E2
private constructor EnumWithSpecializedEntry()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithSpecializedEntry!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public/*package*/ open class Nested {
public/*package*/ constructor Nested()
compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
Vendored
+2 -2
View File
@@ -6,10 +6,10 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
enum entry ANOTHER
private constructor JavaEnum()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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
compiler/testData/loadJava/compiledJava/static/Enum.txt
Vendored
+2 -2
View File
@@ -8,10 +8,10 @@ public final enum class Enum : kotlin.Enum<test.Enum!> {
enum entry C
private constructor Enum()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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()
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
Vendored
+2 -2
View File
@@ -4,10 +4,10 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
enum entry ENTRY
private constructor StaticMembersInEnum()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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!
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
Vendored
+2 -2
View File
@@ -18,10 +18,10 @@ public/*package*/ final enum class StaticMembersInEnum : kotlin.Enum<test.Static
enum entry ENTRY
private constructor StaticMembersInEnum()
public final override /*1*/ /*fake_override*/ val name: kotlin.String
public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
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 const final override /*1*/ /*fake_override*/ val a: kotlin.Int