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

KT-11030 Unify concept of objects and companion objects. Fix order of initialization of nested objects.

Browse Source
This commit is contained in:
Alexey Andreev
2016-03-10 11:47:54 +03:00
parent 8e7d949dd4
commit 337078faf3
13 changed files with 95 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/kotlin_lib.js
Vendored
+13 -13
View File
@@ -905,10 +905,10 @@
return this.start.toString() + '..' + this.endInclusive;
}
}, {
object_initializer$: function () {
return { EMPTY : new this(1, 0) };
}
});
Companion: Kotlin.createObject(null, function () {
this.EMPTY = new Kotlin.NumberRange(1, 0);
})
});
@@ -983,11 +983,11 @@
toString: function () {
return this.start.toString() + '..' + this.endInclusive;
}
}, {
object_initializer$: function () {
return { EMPTY : new this(Kotlin.Long.ONE, Kotlin.Long.ZERO) };
}
});
}, {
Companion: Kotlin.createObject(null, function () {
this.EMPTY = new Kotlin.LongRange(Kotlin.Long.ONE, Kotlin.Long.ZERO);
})
});
@@ -1057,10 +1057,10 @@
return this.start.toString() + '..' + this.endInclusive;
}
}, {
object_initializer$: function () {
return { EMPTY : new this(Kotlin.toChar(1), Kotlin.toChar(0)) };
}
});
Companion: Kotlin.createObject(null, function () {
this.EMPTY = new Kotlin.CharRange(Kotlin.toChar(1), Kotlin.toChar(0));
})
});
/**