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

Renamed doDoMain -> doMainNoExit.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-31 16:45:13 +04:00
parent 95c9c11d8d
commit 72c39dc903
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+2 -2
View File
@@ -148,14 +148,14 @@ public abstract class CLICompiler<A extends CompilerArguments> {
* Useful main for derived command line tools * Useful main for derived command line tools
*/ */
public static void doMain(@NotNull CLICompiler compiler, @NotNull String[] args) { public static void doMain(@NotNull CLICompiler compiler, @NotNull String[] args) {
ExitCode exitCode = doDoMain(compiler, args); ExitCode exitCode = doMainNoExit(compiler, args);
if (exitCode != OK) { if (exitCode != OK) {
System.exit(exitCode.getCode()); System.exit(exitCode.getCode());
} }
} }
@NotNull @NotNull
public static ExitCode doDoMain(@NotNull CLICompiler compiler, @NotNull String[] args) { public static ExitCode doMainNoExit(@NotNull CLICompiler compiler, @NotNull String[] args) {
try { try {
ExitCode rc = compiler.exec(System.out, args); ExitCode rc = compiler.exec(System.out, args);
if (rc != OK) { if (rc != OK) {
compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class CliTest {
PrintStream origOut = System.out; PrintStream origOut = System.out;
try { try {
System.setOut(new PrintStream(bytes)); System.setOut(new PrintStream(bytes));
ExitCode exitCode = CLICompiler.doDoMain(new K2JVMCompiler(), args); ExitCode exitCode = CLICompiler.doMainNoExit(new K2JVMCompiler(), args);
return bytes.toString("utf-8") + exitCode + "\n"; return bytes.toString("utf-8") + exitCode + "\n";
} }
catch (Exception e) { catch (Exception e) {