From 0341d875a98f61470e79e5e078a901be9d520c66 Mon Sep 17 00:00:00 2001 From: develar Date: Tue, 6 Aug 2013 17:24:48 +0400 Subject: [PATCH] JS backend: cleanup code. Drop Kotlin.toString and jet.sure. --- .../k2js/translate/context/StaticContext.java | 4 ---- js/js.translator/testFiles/jsTester/jsTester.js | 2 +- js/js.translator/testFiles/kotlin_lib.js | 14 -------------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java index fc3e81d99e1..107c5ed9c8c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java @@ -441,10 +441,6 @@ public final class StaticContext { else if (moduleName != null) { qualifier.setQualifier(new JsArrayAccess(namer.kotlin("modules"), program.getStringLiteral(moduleName))); } - else if (result == qualifier && result.getIdent().equals("kotlin")) { - // todo WebDemoExamples2Test#testBuilder, package "kotlin" from kotlin/js/js.libraries/src/stdlib/JUMaps.kt must be inlined - // return qualifier; - } } if (qualifier.getQualifier() == null) { diff --git a/js/js.translator/testFiles/jsTester/jsTester.js b/js/js.translator/testFiles/jsTester/jsTester.js index b04d5434bec..d0ba9706bc0 100644 --- a/js/js.translator/testFiles/jsTester/jsTester.js +++ b/js/js.translator/testFiles/jsTester/jsTester.js @@ -33,7 +33,7 @@ var JsTests = (function () { } catch (fail) { if (fail != failedTest) { - reporter.reportError("Unexpected exception " + Kotlin.toString(fail)); + reporter.reportError("Unexpected exception " + fail); } reporter.testFail(testName); return; diff --git a/js/js.translator/testFiles/kotlin_lib.js b/js/js.translator/testFiles/kotlin_lib.js index ce2024fc1c2..597a89a6c71 100644 --- a/js/js.translator/testFiles/kotlin_lib.js +++ b/js/js.translator/testFiles/kotlin_lib.js @@ -29,11 +29,6 @@ String.prototype.contains = function (s) { return this.indexOf(s) !== -1; }; -// todo org.jetbrains.k2js.test.semantics.WebDemoExamples2Test#testBuilder -var kotlin = {set:function (receiver, key, value) { - return receiver.put(key, value); -}}; - (function () { Kotlin.equals = function (obj1, obj2) { if (obj1 == null) { @@ -528,10 +523,6 @@ var kotlin = {set:function (receiver, key, value) { return Kotlin.$new(ArrayIterator)(array); }; - Kotlin.toString = function (obj) { - return obj.toString(); - }; - Kotlin.jsonFromTuples = function (pairArr) { var i = pairArr.length; var res = {}; @@ -560,11 +551,6 @@ var kotlin = {set:function (receiver, key, value) { } return obj1; }; - - //TODO: use intrinsic - Kotlin.sure = function (obj) { - return obj; - }; })(); Kotlin.assignOwner = function(f, o) {