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

JS backend: compile some builtins to builtins.js instead of stdlib

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-11-06 14:31:49 +03:00
parent 5f576c4c05
commit dd86823480
6 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+4 -2
View File
@@ -33,8 +33,7 @@ import java.util.Map;
import java.util.Set;
import static org.jetbrains.jet.utils.UtilsPackage.rethrow;
import static org.jetbrains.k2js.config.LibrarySourcesConfig.STDLIB_JS_FILE_NAME;
import static org.jetbrains.k2js.config.LibrarySourcesConfig.STDLIB_JS_MODULE_NAME;
import static org.jetbrains.k2js.config.LibrarySourcesConfig.*;
import static org.jetbrains.k2js.test.BasicTest.DIST_DIR_PATH;
import static org.jetbrains.k2js.test.BasicTest.TEST_DATA_DIR_PATH;
@@ -178,9 +177,11 @@ public final class RhinoUtils {
NativeObject modules = (NativeObject) kotlin.get("modules");
assert modules != null;
NativeObject stdlibModule = (NativeObject) modules.get(STDLIB_JS_MODULE_NAME);
NativeObject builtinsModule = (NativeObject) modules.get(BUILTINS_JS_MODULE_NAME);
NativeObject newModules = new NativeObject();
newModules.put(STDLIB_JS_MODULE_NAME, newModules, stdlibModule);
newModules.put(BUILTINS_JS_MODULE_NAME, newModules, builtinsModule);
kotlin.put("modules", kotlin, newModules);
}
@@ -196,6 +197,7 @@ public final class RhinoUtils {
runFileWithRhino(TEST_DATA_DIR_PATH + "maps.js", context, scope);
runFileWithRhino(TEST_DATA_DIR_PATH + "long.js", context, scope);
runFileWithRhino(DIST_DIR_PATH + STDLIB_JS_FILE_NAME, context, scope);
runFileWithRhino(DIST_DIR_PATH + BUILTINS_JS_FILE_NAME, context, scope);
//runFileWithRhino(pathToTestFilesRoot() + "jshint.js", context, scope);
for (String jsLibrary : jsLibraries) {
runFileWithRhino(jsLibrary, context, scope);