From 8cea226a873b6ff9f0246499affe9292445d7667 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 8 Oct 2013 21:18:19 +0400 Subject: [PATCH] CLI: move K2JSCompilerArguments#createMainCallParameters to K2JSCompiler. --- .../src/org/jetbrains/jet/cli/js/K2JSCompiler.java | 11 ++++++++++- .../jetbrains/jet/cli/js/K2JSCompilerArguments.java | 11 ----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java index 7b321f57c19..4c5862cfbb2 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -98,7 +98,7 @@ public class K2JSCompiler extends CLICompiler { return ExitCode.INTERNAL_ERROR; } - MainCallParameters mainCallParameters = arguments.createMainCallParameters(); + MainCallParameters mainCallParameters = createMainCallParameters(arguments.main); return translateAndGenerateOutputFile(mainCallParameters, environmentForJS, config, outputFile); } @@ -163,4 +163,13 @@ public class K2JSCompiler extends CLICompiler { return new ClassPathLibraryDefintionsConfig(project, moduleId, ecmaVersion, arguments.sourcemap); } } + + public static MainCallParameters createMainCallParameters(String main) { + if ("noCall".equals(main)) { + return MainCallParameters.noCall(); + } + else { + return MainCallParameters.mainWithoutArguments(); + } + } } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java index 5fabc798f05..c9a99e60edc 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.cli.js; import com.sampullara.cli.Argument; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.cli.CommonCompilerArguments; -import org.jetbrains.k2js.facade.MainCallParameters; /** @@ -49,14 +48,4 @@ public class K2JSCompilerArguments extends CommonCompilerArguments { public String getSrc() { throw new IllegalStateException(); } - - public MainCallParameters createMainCallParameters() { - if ("noCall".equals(main)) { - return MainCallParameters.noCall(); - } - else { - // TODO should we pass the arguments to the compiler? - return MainCallParameters.mainWithoutArguments(); - } - } }