Skip to content

Commit

Permalink
Showing 3 changed files with 9 additions and 2 deletions.
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/RubyInstanceConfig.java
Original file line number Diff line number Diff line change
@@ -1641,6 +1641,10 @@ public boolean shouldJIT() {
public boolean shouldPrecompileAll() {
return this == FORCE;
}

public boolean isTruffle() {
return this == TRUFFLE;
}
}

////////////////////////////////////////////////////////////////////////////
4 changes: 3 additions & 1 deletion core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
Original file line number Diff line number Diff line change
@@ -37,7 +37,6 @@
import org.jruby.util.KCode;
import org.jruby.util.SafePropertyAccessor;
import org.jruby.util.func.Function2;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -384,10 +383,13 @@ private void processArgument() {
config.setCompileMode(RubyInstanceConfig.CompileMode.FORCE);
} else if (extendedOption.equals("-T")) {
config.setCompileMode(RubyInstanceConfig.CompileMode.OFF);
Options.COMPILE_MODE.unforce();
config.setDisableGems(false);
} else if (extendedOption.equals("+T")) {
Options.PARSER_WARN_GROUPED_EXPRESSIONS.force(Boolean.FALSE.toString());
config.setCompileMode(RubyInstanceConfig.CompileMode.TRUFFLE);
// Make the static option consistent with the compile mode.
Options.COMPILE_MODE.force("TRUFFLE");
config.setDisableGems(true);
} else if (extendedOption.endsWith("...")) {
Options.listPrefix(extendedOption.substring(0, extendedOption.length() - "...".length()));
3 changes: 2 additions & 1 deletion core/src/main/java/org/jruby/util/cli/OutputStrings.java
Original file line number Diff line number Diff line change
@@ -113,7 +113,8 @@ public static String getPropertyHelp() {

public static String getVersionString() {
String fullVersion = String.format(
"jruby %s (%s) %s %s %s %s on %s%s%s [%s-%s]",
"jruby%s %s (%s) %s %s %s %s on %s%s%s [%s-%s]",
Options.COMPILE_MODE.load().isTruffle() ? "+truffle" : "",
Constants.VERSION,
Constants.RUBY_VERSION,
Constants.COMPILE_DATE,

0 comments on commit 667f3a7

Please sign in to comment.