JS backend: fixed trait inheritance implementation in ES3.

Now each traits in same hierarchy represent separate object, instead a single object.
This commit is contained in:
Zalim Bashorov
2013-07-16 19:12:04 +04:00
parent c5f53df70d
commit e292034141
3 changed files with 41 additions and 8 deletions
@@ -62,4 +62,8 @@ public final class TraitTest extends SingleFileTranslationTest {
public void testDefinitionOrder() throws Exception {
fooBoxTest();
}
public void testCheckImplementationCharacteristics() throws Exception {
checkFooBoxIsOk();
}
}
@@ -80,15 +80,14 @@ var Kotlin = {};
return true;
};
Kotlin.createTrait = (function () {
return function () {
var result = arguments[0];
for (var i = 1, n = arguments.length; i < n; i++) {
copyProperties(result, arguments[i]);
}
return result;
Kotlin.createTrait = function () {
var n = arguments.length - 1;
var result = arguments[n] || {};
for (var i = 0; i < n; i++) {
copyProperties(result, arguments[i]);
}
})();
return result;
};
Kotlin.definePackage = function (members) {
return members === null ? {} : members;
@@ -0,0 +1,30 @@
package foo
trait A {
fun foo() {}
}
trait B : A {
fun boo() {}
}
native fun eval(code: String): Any = noImpl
native val undefined: Any = noImpl
native class Function(vararg args: String)
val hasProp = Function("obj, prop", "return obj[prop] !== undefined") as ((Any, String)->Boolean)
val PREFIX = "Kotlin.modules.JS_TESTS.foo"
fun box(): String {
val a = object: A {}
val b = object: B {}
if (!hasProp(a, "foo")) return "A hasn't foo"
if (hasProp(a, "boo")) return "A has boo"
if (!hasProp(b, "foo")) return "B hasn't foo"
if (!hasProp(b, "boo")) return "B hasn't boo"
if (eval("$PREFIX.A === $PREFIX.B") as Boolean) return "A and B refer to the same object"
return "OK"
}