Stdlib rename: 'name' and 'ordinal' are now properties in Enum, same name functions are deprecated
This commit is contained in:
+1
-1
@@ -5,5 +5,5 @@ enum class E {
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
return E.OK.name()
|
||||
return E.OK.name
|
||||
}
|
||||
+8
-8
@@ -17,9 +17,9 @@ enum class B {
|
||||
c
|
||||
}
|
||||
fun box(): String {
|
||||
if (Simple.OK.name() != "OK") return "Simple.OK.name() != OK, it: ${Simple.OK.name()}"
|
||||
if (Simple.OK.name != "OK") return "Simple.OK.name != OK, it: ${Simple.OK.name}"
|
||||
val ok = Simple.OK
|
||||
if (ok.ordinal() != 0) return "ok = Simple.Ok; ok.ordinal() != 0, it: ${ok.ordinal()}"
|
||||
if (ok.ordinal != 0) return "ok = Simple.Ok; ok.ordinal != 0, it: ${ok.ordinal}"
|
||||
|
||||
val ok2 = Simple.valueOf("OK")
|
||||
if (!ok2.equals(ok)) return "ok2 not equal ok"
|
||||
@@ -36,13 +36,13 @@ fun box(): String {
|
||||
if (A.a == A.b) return "A.a == A.b"
|
||||
if (A.a.hashCode() == A.b.hashCode()) return "hash(A.a) == hash(A.b)"
|
||||
|
||||
if (A.a.name() != "a") return "A.a.name() != a, it: ${A.a.name()}"
|
||||
if (A.b.name() != "b") return "A.b.name() != b, it: ${A.b.name()}"
|
||||
if (A.c.name() != "c") return "A.c.name() != c, it: ${A.c.name()}"
|
||||
if (A.a.name != "a") return "A.a.name != a, it: ${A.a.name}"
|
||||
if (A.b.name != "b") return "A.b.name != b, it: ${A.b.name}"
|
||||
if (A.c.name != "c") return "A.c.name != c, it: ${A.c.name}"
|
||||
|
||||
if (A.a.ordinal() != 0) return "A.a.ordinal() != 0, it: ${A.a.ordinal()}"
|
||||
if (A.b.ordinal() != 1) return "A.b.ordinal() != 1, it: ${A.b.ordinal()}"
|
||||
if (A.c.ordinal() != 2) return "A.c.ordinal() != 2, it: ${A.c.ordinal()}"
|
||||
if (A.a.ordinal != 0) return "A.a.ordinal != 0, it: ${A.a.ordinal}"
|
||||
if (A.b.ordinal != 1) return "A.b.ordinal != 1, it: ${A.b.ordinal}"
|
||||
if (A.c.ordinal != 2) return "A.c.ordinal != 2, it: ${A.c.ordinal}"
|
||||
|
||||
if (A.c.equals(B.c)) return "A.c.equals(B.c)"
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ enum class MyEnum {
|
||||
|
||||
//TODO: KT-4693
|
||||
inline fun <T> doSmth(a: T) : String {
|
||||
return a.toString() + K.name()
|
||||
return a.toString() + K.name
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+9
-5
@@ -324,11 +324,15 @@
|
||||
this.name$ = void 0;
|
||||
this.ordinal$ = void 0;
|
||||
}, {
|
||||
name: function () {
|
||||
return this.name$;
|
||||
name: {
|
||||
get: function () {
|
||||
return this.name$;
|
||||
}
|
||||
},
|
||||
ordinal: function () {
|
||||
return this.ordinal$;
|
||||
ordinal: {
|
||||
get: function () {
|
||||
return this.ordinal$;
|
||||
}
|
||||
},
|
||||
equals_za3rmp$: function (o) {
|
||||
return this === o;
|
||||
@@ -340,7 +344,7 @@
|
||||
return this.ordinal$ < o.ordinal$ ? -1 : this.ordinal$ > o.ordinal$ ? 1 : 0;
|
||||
},
|
||||
toString: function () {
|
||||
return this.name();
|
||||
return this.name;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user