Minor change: reformat js libs.

This commit is contained in:
Zalim Bashorov
2014-02-14 15:39:55 +04:00
parent 38d1142c39
commit bcd579acdd
3 changed files with 71 additions and 50 deletions
+14 -5
View File
@@ -89,7 +89,8 @@ String.prototype.contains = function (s) {
var message; var message;
if (funName !== undefined) { if (funName !== undefined) {
message = "Function " + funName + " is abstract"; message = "Function " + funName + " is abstract";
} else { }
else {
message = "Function is abstract"; message = "Function is abstract";
} }
throw new TypeError(message); throw new TypeError(message);
@@ -151,6 +152,7 @@ String.prototype.contains = function (s) {
function valueOf(name) { function valueOf(name) {
return this[name]; return this[name];
} }
function getValues() { function getValues() {
return this.values$; return this.values$;
} }
@@ -185,9 +187,10 @@ String.prototype.contains = function (s) {
var modified = false; var modified = false;
var it = collection.iterator(); var it = collection.iterator();
while (it.hasNext()) { while (it.hasNext()) {
if(this.add_za3rmp$(it.next())) if (this.add_za3rmp$(it.next())) {
modified = true; modified = true;
} }
}
return modified return modified
}, },
removeAll_xeylzf$: function (c) { removeAll_xeylzf$: function (c) {
@@ -567,15 +570,21 @@ String.prototype.contains = function (s) {
}; };
Kotlin.numberArrayOfSize = function (size) { Kotlin.numberArrayOfSize = function (size) {
return Kotlin.arrayFromFun(size, function(){ return 0; }); return Kotlin.arrayFromFun(size, function () {
return 0;
});
}; };
Kotlin.charArrayOfSize = function (size) { Kotlin.charArrayOfSize = function (size) {
return Kotlin.arrayFromFun(size, function(){ return '\0'; }); return Kotlin.arrayFromFun(size, function () {
return '\0';
});
}; };
Kotlin.booleanArrayOfSize = function (size) { Kotlin.booleanArrayOfSize = function (size) {
return Kotlin.arrayFromFun(size, function(){ return false; }); return Kotlin.arrayFromFun(size, function () {
return false;
});
}; };
Kotlin.arrayFromFun = function (size, initFun) { Kotlin.arrayFromFun = function (size, initFun) {
+16 -7
View File
@@ -107,7 +107,8 @@ var Kotlin = {};
property.$classIndex$ = metadata.classIndex; property.$classIndex$ = metadata.classIndex;
if (typeof property === "function") { if (typeof property === "function") {
metadata.functions[p] = property; metadata.functions[p] = property;
} else { }
else {
metadata.properties[p] = property; metadata.properties[p] = property;
} }
} }
@@ -141,7 +142,8 @@ var Kotlin = {};
var prototypeObj; var prototypeObj;
if (metadata.baseClass !== null) { if (metadata.baseClass !== null) {
prototypeObj = Object.create(metadata.baseClass.prototype); prototypeObj = Object.create(metadata.baseClass.prototype);
} else { }
else {
prototypeObj = {}; prototypeObj = {};
} }
Object.defineProperties(prototypeObj, metadata.properties); Object.defineProperties(prototypeObj, metadata.properties);
@@ -184,7 +186,8 @@ var Kotlin = {};
function getBases(basesFun) { function getBases(basesFun) {
if (typeof basesFun === "function") { if (typeof basesFun === "function") {
return basesFun(); return basesFun();
} else { }
else {
return basesFun; return basesFun;
} }
} }
@@ -195,6 +198,7 @@ var Kotlin = {};
Object.defineProperty(this, $o.className, {value: klass}); Object.defineProperty(this, $o.className, {value: klass});
return klass; return klass;
} }
$o.type = Kotlin.TYPE.INIT_FUN; $o.type = Kotlin.TYPE.INIT_FUN;
return $o; return $o;
}; };
@@ -205,6 +209,7 @@ var Kotlin = {};
Object.defineProperty(this, $o.className, {value: klass}); Object.defineProperty(this, $o.className, {value: klass});
return klass; return klass;
} }
$o.type = Kotlin.TYPE.INIT_FUN; $o.type = Kotlin.TYPE.INIT_FUN;
return $o; return $o;
}; };
@@ -243,7 +248,8 @@ var Kotlin = {};
Kotlin.isType = function (object, klass) { Kotlin.isType = function (object, klass) {
if (object == null || klass == null) { if (object == null || klass == null) {
return false; return false;
} else { }
else {
if (object instanceof klass) { if (object instanceof klass) {
return true; return true;
} }
@@ -285,10 +291,12 @@ var Kotlin = {};
get: members[p], get: members[p],
configurable: true configurable: true
}); });
} else { }
else {
definition[p] = members[p]; definition[p] = members[p];
} }
} else { }
else {
Object.defineProperty(definition, p, members[p]); Object.defineProperty(definition, p, members[p]);
} }
} }
@@ -312,7 +320,8 @@ var Kotlin = {};
if (initializer === null) { if (initializer === null) {
definition.$initializer$ = emptyFunction(); definition.$initializer$ = emptyFunction();
} else { }
else {
definition.$initializer$ = initializer; definition.$initializer$ = initializer;
} }
return definition; return definition;
+6 -3
View File
@@ -618,8 +618,9 @@ Kotlin.PrimitiveHashSet = Kotlin.createClassNow(Kotlin.AbstractCollection,
var hn1 = iter1.hasNext(); var hn1 = iter1.hasNext();
var hn2 = iter2.hasNext(); var hn2 = iter2.hasNext();
if (hn1 != hn2) return false; if (hn1 != hn2) return false;
if (!hn2) if (!hn2) {
return true; return true;
}
else { else {
var o1 = iter1.next(); var o1 = iter1.next();
var o2 = iter2.next(); var o2 = iter2.next();
@@ -635,10 +636,12 @@ Kotlin.PrimitiveHashSet = Kotlin.createClassNow(Kotlin.AbstractCollection,
var iter = this.iterator(); var iter = this.iterator();
var first = true; var first = true;
while (iter.hasNext()) { while (iter.hasNext()) {
if (first) if (first) {
first = false; first = false;
else }
else {
builder += ", "; builder += ", ";
}
builder += iter.next(); builder += iter.next();
} }
builder += "]"; builder += "]";