From b5ee5877ce66f81ce653455219be2eef26c744f5 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Sat, 4 Oct 2014 17:40:28 +0400 Subject: [PATCH] JS backend: kotlin_lib_compiled -> stdlib. --- build.xml | 9 +++++++-- .../k2js/config/LibrarySourcesConfig.java | 4 +++- .../test/org/jetbrains/k2js/test/BasicTest.java | 2 ++ .../config/LibrarySourcesConfigWithCaching.java | 2 +- .../org/jetbrains/k2js/test/rhino/RhinoUtils.java | 15 ++++++++++----- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 0970973ea1a..302b343b34c 100644 --- a/build.xml +++ b/build.xml @@ -218,7 +218,9 @@ - + + + @@ -253,7 +255,10 @@ - + + + + diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java index b165f59d1dd..4a52c85229b 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java @@ -49,6 +49,8 @@ public class LibrarySourcesConfig extends Config { @NotNull private static final Logger LOG = Logger.getInstance("#org.jetbrains.k2js.config.LibrarySourcesConfig"); + public static final String STDLIB_JS_MODULE_NAME = "stdlib"; + public static final String STDLIB_JS_FILE_NAME = STDLIB_JS_MODULE_NAME + ".js"; @NotNull private final List files; @@ -82,7 +84,7 @@ public class LibrarySourcesConfig extends Config { moduleName = path.substring(1); } else if (path.endsWith(".jar") || path.endsWith(".zip")) { - String actualModuleName = isJsRuntimeLibrary(new File(path)) ? "kotlin_lib_compiled" : moduleName; + String actualModuleName = isJsRuntimeLibrary(new File(path)) ? STDLIB_JS_MODULE_NAME : moduleName; try { jetFiles.addAll(readZip(path, actualModuleName)); diff --git a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java index c44f64651ef..b335c188bdc 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java @@ -59,6 +59,8 @@ public abstract class BasicTest extends KotlinTestWithEnvironment { private static final boolean DELETE_OUT = false; public static final String TEST_DATA_DIR_PATH = "js/js.translator/testData/"; + public static final String DIST_DIR_PATH = "dist/"; + private static final String CASES = "cases/"; private static final String OUT = "out/"; private static final String EXPECTED = "expected/"; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/config/LibrarySourcesConfigWithCaching.java b/js/js.tests/test/org/jetbrains/k2js/test/config/LibrarySourcesConfigWithCaching.java index f527e901a65..62d89140223 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/config/LibrarySourcesConfigWithCaching.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/config/LibrarySourcesConfigWithCaching.java @@ -37,7 +37,7 @@ import java.util.List; public class LibrarySourcesConfigWithCaching extends LibrarySourcesConfig { public static final List JS_STDLIB = - Arrays.asList("@" + "kotlin_lib_compiled", PathUtil.getKotlinPathsForDistDirectory().getJsLibJarPath().getAbsolutePath()); + Arrays.asList("@" + STDLIB_JS_MODULE_NAME, PathUtil.getKotlinPathsForDistDirectory().getJsLibJarPath().getAbsolutePath()); private static List jsLibFiles; private static AnalyzeExhaust exhaust; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java index 9ded7daf6fb..215c62113c0 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java @@ -27,9 +27,15 @@ import org.mozilla.javascript.*; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Collections; +import java.util.List; +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.test.BasicTest.DIST_DIR_PATH; import static org.jetbrains.k2js.test.BasicTest.TEST_DATA_DIR_PATH; public final class RhinoUtils { @@ -168,11 +174,10 @@ public final class RhinoUtils { assert kotlin != null; NativeObject modules = (NativeObject) kotlin.get("modules"); assert modules != null; - String stdlibModuleName = "kotlin_lib_compiled"; - NativeObject stdlibModule = (NativeObject) modules.get(stdlibModuleName); + NativeObject stdlibModule = (NativeObject) modules.get(STDLIB_JS_MODULE_NAME); NativeObject newModules = new NativeObject(); - newModules.put(stdlibModuleName, newModules, stdlibModule); + newModules.put(STDLIB_JS_MODULE_NAME, newModules, stdlibModule); kotlin.put("modules", kotlin, newModules); } @@ -185,9 +190,9 @@ public final class RhinoUtils { try { runFileWithRhino(getKotlinLibFile(version), context, scope); runFileWithRhino(TEST_DATA_DIR_PATH + "kotlin_lib.js", context, scope); - runFileWithRhino(TEST_DATA_DIR_PATH + "kotlin_lib_compiled.js", context, scope); 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(pathToTestFilesRoot() + "jshint.js", context, scope); for (String jsLibrary : jsLibraries) { runFileWithRhino(jsLibrary, context, scope);