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

JS backend: remove ECMA 3, but several tests is broken.

Browse Source 
Main reason: overload extention property:

Int.bar = 1
String.bar = 2
This commit is contained in:
Erokhin Stanislav
2013-08-28 19:53:15 +04:00
parent 248ec7a248
commit 4c57d70be9
20 changed files with 54 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+1 -6
View File
@@ -40,7 +40,7 @@ import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFi
public abstract class BasicTest extends KotlinTestWithEnvironment {
// predictable order of ecma version in tests
protected static final Iterable<EcmaVersion> DEFAULT_ECMA_VERSIONS = Lists.newArrayList(EcmaVersion.v5, EcmaVersion.v3);
protected static final Iterable<EcmaVersion> DEFAULT_ECMA_VERSIONS = Lists.newArrayList(EcmaVersion.v5);
private static final boolean DELETE_OUT = false;
private static final String TEST_FILES = "js/js.translator/testFiles/";
@@ -216,9 +216,4 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
protected String expected(@NotNull String testName) {
return getExpectedPath() + testName + ".out";
}
@NotNull
protected static List<EcmaVersion> failOnEcma5() {
return Collections.singletonList(EcmaVersion.v3);
}
}
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+2 -2
View File
@@ -36,7 +36,6 @@ import static org.jetbrains.jet.utils.ExceptionUtils.rethrow;
import static org.jetbrains.k2js.test.BasicTest.pathToTestFilesRoot;
public final class RhinoUtils {
private static final String KOTLIN_JS_LIB_ECMA_3 = pathToTestFilesRoot() + "kotlin_lib_ecma3.js";
private static final String KOTLIN_JS_LIB_ECMA_5 = pathToTestFilesRoot() + "kotlin_lib_ecma5.js";
private static final Set<String> IGNORED_JSHINT_WARNINGS = Sets.newHashSet();
@@ -212,7 +211,8 @@ public final class RhinoUtils {
@NotNull
public static String getKotlinLibFile(@NotNull EcmaVersion ecmaVersion) {
return ecmaVersion == EcmaVersion.v5 ? KOTLIN_JS_LIB_ECMA_5 : KOTLIN_JS_LIB_ECMA_3;
assert ecmaVersion == EcmaVersion.v5 : "Ecma 3 is deprecate";
return KOTLIN_JS_LIB_ECMA_5;
}
static void flushSystemOut(@NotNull Context context, @NotNull Scriptable scope) {
js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java
+1 -1
View File
@@ -73,7 +73,7 @@ public abstract class JsUnitTestBase extends MultipleFilesTranslationTest {
}
public void runTestFile(@NotNull String pathToTestFile) throws Exception {
Iterable<EcmaVersion> versions = failOnEcma5();
Iterable<EcmaVersion> versions = DEFAULT_ECMA_VERSIONS;
String testName = pathToTestFile.substring(pathToTestFile.lastIndexOf("/"));
generateJavaScriptFiles(Lists.newArrayList(pathToTestFile), testName, MainCallParameters.noCall(), versions,
TestConfigWithUnitTests.FACTORY);
js/js.tests/test/org/jetbrains/k2js/test/semantics/KotlinLibTest.java
+1 -1
View File
@@ -64,7 +64,7 @@ public final class KotlinLibTest extends SingleFileTranslationTest {
private void runJavascriptTest(@NotNull String filename) throws Exception {
runRhinoTest(withAdditionalFiles(cases(filename), EcmaVersion.v3),
runRhinoTest(withAdditionalFiles(cases(filename), EcmaVersion.defaultVersion()),
new RhinoFunctionResultChecker("test", true));
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/RegressionMergeEcmaTest.java
+8
View File
@@ -60,6 +60,14 @@ public class RegressionMergeEcmaTest extends SingleFileTranslationTest {
checkFooBoxIsOk();
}
public void testOverloadFun() throws Exception {
checkFooBoxIsOk();
}
public void testOverloadExtension() throws Exception {
checkFooBoxIsOk();
}
public void testClassInitializer() throws Exception {
checkFooBoxIsOk();
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java
+1 -3
View File
@@ -55,10 +55,8 @@ public final class StandardClassesTest extends SingleFileTranslationTest {
// fooBoxTest();
// }
//TODO: fails on ecma 5 because of ArrayIterator declaration: ecma 5 expects hasNext to be property while it is a function
public void testArraysIterator() throws Exception {
fooBoxTest(failOnEcma5());
fooBoxTest();
}
public void testArrayFactoryMethods() throws Exception {
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayQUnitTest.java
+1 -16
View File
@@ -16,20 +16,6 @@
package org.jetbrains.k2js.test.semantics;
import closurecompiler.internal.com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.test.rhino.CompositeRhinoResultsChecker;
import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
import org.jetbrains.k2js.test.rhino.RhinoQUnitResultChecker;
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
import java.io.File;
import java.util.EnumSet;
import java.util.Map;
import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
/**
*/
public class StdLibJsArrayQUnitTest extends StdLibQUnitTestSupport {
@@ -41,8 +27,7 @@ public class StdLibJsArrayQUnitTest extends StdLibQUnitTestSupport {
// when ran in batch
public void DISABLED_testArrayQUnitTest() throws Exception {
//performStdLibTest(EcmaVersion.all(),
performStdLibTest(EnumSet.of(EcmaVersion.v3),
performStdLibTest(DEFAULT_ECMA_VERSIONS,
"libraries/stdlib/test",
"js/JsArrayTest.kt");
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayScriptTest.java
+1 -4
View File
@@ -23,8 +23,6 @@ import org.jetbrains.k2js.test.rhino.CompositeRhinoResultsChecker;
import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
import java.io.File;
import java.util.EnumSet;
import java.util.Map;
import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
@@ -33,8 +31,7 @@ import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
*/
public class StdLibJsArrayScriptTest extends StdLibTestBase {
public void testArrayScriptTest() throws Exception {
//performStdLibTest(EcmaVersion.all(),
performStdLibTest(EnumSet.of(EcmaVersion.v3),
performStdLibTest(DEFAULT_ECMA_VERSIONS,
"libraries/stdlib/test",
"js/JsArrayScript.kt");
}
js/js.translator/qunit/index.html
+2 -2
View File
@@ -6,9 +6,9 @@
<link rel="stylesheet" href="qunit.css">
<script src="qunit.js"></script>
<script src="../testFiles/kotlin_lib_ecma3.js"></script>
<script src="../testFiles/kotlin_lib_ecma5.js"></script>
<script src="../testFiles/kotlin_lib.js"></script>
<script src="../testFiles/kotlin-js-library/out/GenerateTestCase.compiler_v3.js"></script>
<script src="../testFiles/kotlin-js-library/out/GenerateTestCase.compiler_v5.js"></script>
<script src="deepEqual.js"></script>
<script src="swarminject.js"></script>
js/js.translator/src/org/jetbrains/k2js/config/EcmaVersion.java
+1 -8
View File
@@ -16,20 +16,13 @@
package org.jetbrains.k2js.config;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public enum EcmaVersion {
v3, v5;
@NotNull
public static EcmaVersion fromString(@Nullable String target) {
return StringUtil.compareVersionNumbers(target, "v5") >= 0 ? v5 : v3;
}
@NotNull
public static EcmaVersion defaultVersion() {
return v3;
return v5;
}
}
js/js.translator/testFiles/kotlin_lib_ecma3.js
-209
View File
@@ -1,209 +0,0 @@
/* Prototype JavaScript framework, version 1.6.1
* (c) 2005-2009 Sam Stephenson
*
* Prototype is freely distributable under the terms of an MIT-style license.
* For details, see the Prototype web site: http://www.prototypejs.org/
*
*--------------------------------------------------------------------------*/
var Kotlin = {};
(function () {
"use strict";
var emptyFunction = function () {
};
if (!Array.isArray) {
Array.isArray = function (vArg) {
return Object.prototype.toString.call(vArg) === "[object Array]";
};
}
if (!Function.prototype.bind) {
Function.prototype.bind = function (oThis) {
if (typeof this !== "function") {
// closest thing possible to the ECMAScript 5 internal IsCallable function
throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
}
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
fNOP = function () {
},
fBound = function () {
return fToBind.apply(this instanceof fNOP && oThis
? this
: oThis,
aArgs.concat(Array.prototype.slice.call(arguments)));
};
fNOP.prototype = this.prototype;
fBound.prototype = new fNOP();
return fBound;
};
}
Kotlin.keys = Object.keys || function (o) {
var result = [];
var i = 0;
for (var p in o) {
if (o.hasOwnProperty(p)) {
result[i++] = p;
}
}
return result;
};
function copyProperties(to, from) {
for (var p in from) {
if (from.hasOwnProperty(p)) {
to[p] = from[p];
}
}
}
Kotlin.isType = function (object, klass) {
if (object === null || object === undefined) {
return false;
}
var current = object.get_class();
while (current !== klass) {
if (current === null) {
return false;
}
current = current.superclass;
}
return true;
};
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;
};
Kotlin.createClass = (function () {
function subclass() {
}
function create(parent, properties, staticProperties) {
var traits = null;
if (parent instanceof Array) {
traits = parent;
parent = parent[0];
}
function klass() {
this.initializing = klass;
if (this.initialize) {
this.initialize.apply(this, arguments);
}
}
klass.addMethods = addMethods;
klass.superclass = parent || null;
klass.subclasses = [];
klass.object$ = object$;
if (parent) {
if (typeof (parent) == "function") {
subclass.prototype = parent.prototype;
klass.prototype = new subclass();
parent.subclasses.push(klass);
}
else {
// trait
klass.addMethods(parent);
}
}
klass.addMethods({get_class: function () {
return klass;
}});
if (parent !== null) {
klass.addMethods({super_init: function () {
this.initializing = this.initializing.superclass;
this.initializing.prototype.initialize.apply(this, arguments);
}});
}
if (traits !== null) {
for (var i = 1, n = traits.length; i < n; i++) {
klass.addMethods(traits[i]);
}
}
if (properties !== null && properties !== undefined) {
klass.addMethods(properties);
}
if (!klass.prototype.initialize) {
klass.prototype.initialize = emptyFunction;
}
klass.prototype.constructor = klass;
if (staticProperties !== null && staticProperties !== undefined) {
copyProperties(klass, staticProperties);
}
return klass;
}
function addMethods(source) {
copyProperties(this.prototype, source);
return this;
}
function object$() {
if (typeof this.$object$ === "undefined") {
this.$object$ = this.object_initializer$();
}
return this.$object$;
}
return create;
})();
Kotlin.$createClass = function (parent, properties) {
if (parent !== null && typeof (parent) != "function") {
properties = parent;
parent = null;
}
return Kotlin.createClass(parent, properties, null);
};
Kotlin.createObjectWithPrototype = function (prototype) {
function C() {}
C.prototype = prototype;
return new C();
};
Kotlin.$new = function (f) {
var o = Kotlin.createObjectWithPrototype(f.prototype);
return function () {
f.apply(o, arguments);
return o;
};
};
Kotlin.createObject = function () {
var singletonClass = Kotlin.createClass.apply(null, arguments);
return new singletonClass();
};
Kotlin.defineModule = function (id, module) {
if (id in Kotlin.modules) {
throw Kotlin.$new(Kotlin.IllegalArgumentException)();
}
Kotlin.modules[id] = module;
};
})();
js/js.translator/testFiles/mergeEcma/cases/overloadExtension.kt
+13
View File
@@ -0,0 +1,13 @@
package foo
fun Int.foo() {}
fun String.foo() {}
val Int.bar = 1
val String.bar = 2
fun box(): String {
val a = 43
if (a.bar != 1) return "a.bar != 1, it: ${a.bar}"
return "OK"
}
js/js.translator/testFiles/mergeEcma/cases/overloadFun.kt
+12
View File
@@ -0,0 +1,12 @@
package foo
class A {
fun test(a: Int) {}
fun test() {}
}
fun box(): String {
return "OK"
}