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

KT-3008 Merge JS runtime modules in one kotlin.js

Browse Source
This commit is contained in:
Alexey Andreev
2016-04-12 16:30:40 +03:00
parent b556b6efca
commit 0cfacfa44a
25 changed files with 119 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/kotlin_lib.js
Vendored
+18 -14
View File
@@ -274,7 +274,7 @@
*/
lazyInitClasses.ArrayIterator = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.MutableIterator];
return [Kotlin.kotlin.collections.MutableIterator];
},
/** @constructs */
function (array) {
@@ -306,7 +306,7 @@
*/
lazyInitClasses.ListIterator = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.ListIterator]; // TODO: MutableListIterator
return [Kotlin.kotlin.collections.ListIterator]; // TODO: MutableListIterator
},
/** @constructs */
function (list, index) {
@@ -340,6 +340,8 @@
}
});
Kotlin.Annotation = Kotlin.createTraitNow(null);
Kotlin.Enum = Kotlin.createClassNow(null,
function () {
this.name$ = void 0;
@@ -380,7 +382,7 @@
lazyInitClasses.AbstractCollection = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.MutableCollection];
return [Kotlin.kotlin.collections.MutableCollection];
}, null, {
addAll_wtfk93$: function (collection) {
var modified = false;
@@ -474,7 +476,7 @@
*/
lazyInitClasses.AbstractList = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.MutableList, Kotlin.AbstractCollection];
return [Kotlin.kotlin.collections.MutableList, Kotlin.AbstractCollection];
}, null, {
iterator: function () {
return new Kotlin.ListIterator(this);
@@ -792,7 +794,7 @@
lazyInitClasses.RangeIterator = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.Iterator];
return [Kotlin.kotlin.collections.Iterator];
},
function (start, end, step) {
this.start = start;
@@ -878,7 +880,7 @@
lazyInitClasses.NumberProgression = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.Iterable];
return [Kotlin.kotlin.collections.Iterable];
},
function (start, end, step) {
this.first = start;
@@ -904,7 +906,7 @@
lazyInitClasses.NumberRange = Kotlin.createClass(
function() {
return [Kotlin.modules['builtins'].kotlin.ranges.ClosedRange, Kotlin.NumberProgression]
return [Kotlin.kotlin.ranges.ClosedRange, Kotlin.NumberProgression]
},
function $fun(start, endInclusive) {
$fun.baseInitializer.call(this, start, endInclusive, 1);
@@ -934,7 +936,7 @@
lazyInitClasses.LongRangeIterator = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.Iterator];
return [Kotlin.kotlin.collections.Iterator];
},
function (start, end, step) {
this.start = start;
@@ -957,7 +959,7 @@
lazyInitClasses.LongProgression = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.Iterable];
return [Kotlin.kotlin.collections.Iterable];
},
function (start, end, step) {
this.first = start;
@@ -983,7 +985,7 @@
lazyInitClasses.LongRange = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.ranges.ClosedRange, Kotlin.LongProgression];
return [Kotlin.kotlin.ranges.ClosedRange, Kotlin.LongProgression];
},
function $fun(start, endInclusive) {
$fun.baseInitializer.call(this, start, endInclusive, Kotlin.Long.ONE);
@@ -1027,7 +1029,7 @@
lazyInitClasses.CharProgression = Kotlin.createClassNow(
function () {
return [Kotlin.modules['builtins'].kotlin.collections.Iterable];
return [Kotlin.kotlin.collections.Iterable];
},
function (start, end, step) {
this.first = start;
@@ -1056,7 +1058,7 @@
lazyInitClasses.CharRange = Kotlin.createClass(
function() {
return [Kotlin.modules['builtins'].kotlin.ranges.ClosedRange, Kotlin.CharProgression]
return [Kotlin.kotlin.ranges.ClosedRange, Kotlin.CharProgression]
},
function $fun(start, endInclusive) {
$fun.baseInitializer.call(this, start, endInclusive, 1);
@@ -1238,6 +1240,8 @@
}
return obj1;
};
Kotlin.createDefinition(lazyInitClasses, Kotlin);
Kotlin.lazyInitClasses = Kotlin.lazyInitClasses || [];
Kotlin.lazyInitClasses.push(lazyInitClasses);
})(Kotlin);