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

Move default inline flag to JVM back-end

Browse Source 
- other back-ends are likely to have its own value of this flag
- get rid of DEFAULT_INLINE_FLAG_FOR_TEST
- the main goal was to simplify the default GenerationState constructor, which
  now always uses default inline flag value
This commit is contained in:
Alexander Udalov
2014-05-05 23:09:09 +04:00
parent 9679e3ce4a
commit d42598a935
13 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CompilerArgumentsUtil.java
+11 -17
View File
@@ -19,27 +19,21 @@ package org.jetbrains.jet.cli.common.arguments;
import org.jetbrains.annotations.Nullable;
public class CompilerArgumentsUtil {
public static final boolean DEFAULT_INLINE_FLAG = true;
public static final boolean DEFAULT_INLINE_FLAG_FOR_TEST = true;
public static boolean optionToInlineFlag(@Nullable String option) {
boolean enableInline = "on".equalsIgnoreCase(option) || "true".equalsIgnoreCase(option);
return (enableInline || "off".equalsIgnoreCase(option) || "false".equalsIgnoreCase(option)) ? enableInline : DEFAULT_INLINE_FLAG;
public static boolean optionToBooleanFlag(@Nullable String option, boolean defaultValue) {
boolean enabled = "on".equalsIgnoreCase(option) || "true".equalsIgnoreCase(option);
boolean disabled = "off".equalsIgnoreCase(option) || "false".equalsIgnoreCase(option);
return (enabled || disabled) ? enabled : defaultValue;
}
public static boolean checkInlineOption(@Nullable String option) {
if (option == null ||
"on".equalsIgnoreCase(option) ||
"off".equalsIgnoreCase(option) ||
"true".equalsIgnoreCase(option) ||
"false".equalsIgnoreCase(option)) {
return true;
}
return false;
public static boolean checkOption(@Nullable String option) {
return option == null ||
"on".equalsIgnoreCase(option) ||
"off".equalsIgnoreCase(option) ||
"true".equalsIgnoreCase(option) ||
"false".equalsIgnoreCase(option);
}
public static String getWrongOptionErrorMessage(@Nullable String inline) {
public static String getWrongInlineOptionErrorMessage(@Nullable String inline) {
return "Wrong value for inline option: '" + inline + "'. Should be 'on'/'off' or 'true'/'false'";
}
}