From a034eefb51e335e67912b6137a81433f9a7d8ddb Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Mon, 9 Apr 2012 22:31:41 +0400 Subject: [PATCH] js: rename "anonymous" ns to "root" also use constant field instead of hardcoded literal in tests --- .../jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java | 3 ++- .../org/jetbrains/k2js/test/semantics/ExamplesTest.java | 3 ++- .../org/jetbrains/k2js/test/semantics/FunctionTest.java | 4 +++- .../test/org/jetbrains/k2js/test/semantics/MiscTest.java | 3 ++- .../src/org/jetbrains/k2js/translate/context/Namer.java | 6 +++--- .../jetbrains/k2js/translate/utils/JsDescriptorUtils.java | 2 +- .../src/org/jetbrains/k2js/translate/utils/PsiUtils.java | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java index fd1d0d33962..dabe994f36f 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java @@ -17,6 +17,7 @@ package org.jetbrains.k2js.test.rhino; import org.jetbrains.annotations.NotNull; +import org.jetbrains.k2js.translate.context.Namer; import org.jetbrains.k2js.utils.GenerationUtils; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; @@ -58,7 +59,7 @@ public final class RhinoSystemOutputChecker implements RhinoResultChecker { } private void runMain(Context context, Scriptable scope) { - String callToMain = GenerationUtils.generateCallToMain("Anonymous", arguments); + String callToMain = GenerationUtils.generateCallToMain(Namer.getRootNamespaceName(), arguments); context.evaluateString(scope, callToMain, "function call", 0, null); } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java index ecfaa12bcff..944ccc6f766 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java @@ -20,6 +20,7 @@ import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.k2js.test.BasicTest; import org.jetbrains.k2js.test.SingleFileTranslationTest; +import org.jetbrains.k2js.translate.context.Namer; @SuppressWarnings("JUnitTestCaseWithNoTests") public final class ExamplesTest extends SingleFileTranslationTest { @@ -35,7 +36,7 @@ public final class ExamplesTest extends SingleFileTranslationTest { @Override public void runTest() throws Exception { - runFunctionOutputTest(filename, "Anonymous", "box", "OK"); + runFunctionOutputTest(filename, Namer.getRootNamespaceName(), "box", "OK"); } public static Test suite() throws Exception { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java index 7a84b5f5b87..20eeae619cc 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java @@ -16,6 +16,8 @@ package org.jetbrains.k2js.test.semantics; +import org.jetbrains.k2js.translate.context.Namer; + /** * @author Pavel Talanov */ @@ -58,7 +60,7 @@ public class FunctionTest extends AbstractExpressionTest { } public void testEnclosingThis() throws Exception { - runFunctionOutputTest("enclosingThis.kt", "Anonymous", "box", "OK"); + runFunctionOutputTest("enclosingThis.kt", Namer.getRootNamespaceName(), "box", "OK"); } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java index c052679f13d..e6b3a42c8d5 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java @@ -16,6 +16,7 @@ package org.jetbrains.k2js.test.semantics; +import org.jetbrains.k2js.translate.context.Namer; import org.mozilla.javascript.JavaScriptException; /** @@ -45,7 +46,7 @@ public final class MiscTest extends AbstractExpressionTest { } public void testClassWithoutNamespace() throws Exception { - runFunctionOutputTest("classWithoutNamespace.kt", "Anonymous", "box", true); + runFunctionOutputTest("classWithoutNamespace.kt", Namer.getRootNamespaceName(), "box", true); } public void testIfElseAsExpressionWithThrow() throws Exception { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java index fe7c7896602..dc8c52adffe 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java @@ -41,7 +41,7 @@ public final class Namer { private static final String BACKING_FIELD_PREFIX = "$"; private static final String SUPER_METHOD_NAME = "super_init"; private static final String KOTLIN_OBJECT_NAME = "Kotlin"; - private static final String ANONYMOUS_NAMESPACE = "Anonymous"; + private static final String ROOT_NAMESPACE = "Root"; private static final String RECEIVER_PARAMETER_NAME = "receiver"; private static final String CLASSES_OBJECT_NAME = "classes"; @@ -51,8 +51,8 @@ public final class Namer { } @NotNull - public static String getAnonymousNamespaceName() { - return ANONYMOUS_NAMESPACE; + public static String getRootNamespaceName() { + return ROOT_NAMESPACE; } @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java index 1c2fe9dd357..fbe68a0a5ec 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java @@ -153,7 +153,7 @@ public final class JsDescriptorUtils { @NotNull public static String getNameForNamespace(@NotNull NamespaceDescriptor descriptor) { if (descriptor.getContainingDeclaration() instanceof ModuleDescriptor) { - return Namer.getAnonymousNamespaceName(); + return Namer.getRootNamespaceName(); } else { return descriptor.getName(); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java index 496bbc7750b..4a505f325f3 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java @@ -149,7 +149,7 @@ public final class PsiUtils { String name = namespaceHeader.getName(); assert name != null : "NamespaceHeader must have a name"; if (name.isEmpty()) { - return Namer.getAnonymousNamespaceName(); + return Namer.getRootNamespaceName(); } return name; }