From 0a610d81ad1b873cd7802e6d833ec8f963926b52 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sun, 8 Apr 2012 02:08:26 +0400 Subject: [PATCH] compiler argument parsing cleanup --- .../org/jetbrains/jet/cli/KotlinCompiler.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java index 9a1f8daa25c..8d2d9edea58 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java @@ -106,12 +106,19 @@ public class KotlinCompiler { CompilerSpecialMode mode; if (arguments.mode == null) { mode = CompilerSpecialMode.REGULAR; - } else if (arguments.mode.equals("jdkHeaders")) { - mode = CompilerSpecialMode.JDK_HEADERS; - } else if (arguments.mode.equals("builtins")) { - mode = CompilerSpecialMode.BUILTINS; - } else { - throw new IllegalArgumentException("unknown compiler mode: " + arguments.mode); + } + else { + computeMode: + { + for (CompilerSpecialMode variant : CompilerSpecialMode.values()) { + if (arguments.mode.equalsIgnoreCase(variant.name().replaceAll("_", ""))) { + mode = variant; + break computeMode; + } + } + // TODO: report properly + throw new IllegalArgumentException("unknown compiler mode: " + arguments.mode); + } } CompileEnvironment environment = new CompileEnvironment(messageRenderer, arguments.verbose, mode);