Rename option to --warn-truffle-regex-fallback and separate from --use-truffle-regex

Author: eregon

src/main/java/org/truffleruby/options/Options.java

@@ -129,8 +129,8 @@ public class Options {
     public final boolean WARN_EXPERIMENTAL;
     /** --use-truffle-regex=false */
     public final boolean USE_TRUFFLE_REGEX;
-    /** --use-truffle-regex-with-warn=false */
-    public final boolean USE_TRUFFLE_REGEX_WITH_WARN;
+    /** --warn-truffle-regex-fallback=false */
+    public final boolean WARN_TRUFFLE_REGEX_FALLBACK;
     /** --argv-globals=false */
     public final boolean ARGV_GLOBALS;
     /** --chomp-loop=false */
@@ -248,7 +248,7 @@ public Options(Env env, OptionValues options, LanguageOptions languageOptions) {
         WARN_DEPRECATED = options.get(OptionsCatalog.WARN_DEPRECATED_KEY);
         WARN_EXPERIMENTAL = options.get(OptionsCatalog.WARN_EXPERIMENTAL_KEY);
         USE_TRUFFLE_REGEX = options.get(OptionsCatalog.USE_TRUFFLE_REGEX_KEY);
-        USE_TRUFFLE_REGEX_WITH_WARN = options.get(OptionsCatalog.USE_TRUFFLE_REGEX_WITH_WARN_KEY);
+        WARN_TRUFFLE_REGEX_FALLBACK = options.get(OptionsCatalog.WARN_TRUFFLE_REGEX_FALLBACK_KEY);
         ARGV_GLOBALS = options.get(OptionsCatalog.ARGV_GLOBALS_KEY);
         CHOMP_LOOP = options.get(OptionsCatalog.CHOMP_LOOP_KEY);
         GETS_LOOP = options.get(OptionsCatalog.GETS_LOOP_KEY);
@@ -390,8 +390,8 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return WARN_EXPERIMENTAL;
             case "ruby.use-truffle-regex":
                 return USE_TRUFFLE_REGEX;
-            case "ruby.use-truffle-regex-with-warn":
-                return USE_TRUFFLE_REGEX_WITH_WARN;
+            case "ruby.warn-truffle-regex-fallback":
+                return WARN_TRUFFLE_REGEX_FALLBACK;
             case "ruby.argv-globals":
                 return ARGV_GLOBALS;
             case "ruby.chomp-loop":

src/main/ruby/truffleruby/core/truffle/regexp_operations.rb

@@ -64,7 +64,7 @@ def self.match_from(re, str, pos)
     Truffle::Boot.delay do
       COMPARE_ENGINES = Truffle::Boot.get_option('compare-regex-engines')
       USE_TRUFFLE_REGEX = Truffle::Boot.get_option('use-truffle-regex')
-      USE_TRUFFLE_REGEX_WITH_WARN = Truffle::Boot.get_option('use-truffle-regex-with-warn')
+      WARN_TRUFFLE_REGEX_FALLBACK = Truffle::Boot.get_option('warn-truffle-regex-fallback')
 
       if Truffle::Boot.get_option('regexp-instrument-creation') or Truffle::Boot.get_option('regexp-instrument-match')
         at_exit do
@@ -76,7 +76,7 @@ def self.match_from(re, str, pos)
     def self.match_in_region(re, str, from, to, at_start, start)
       if COMPARE_ENGINES
         match_in_region_compare_engines(re, str, from, to, at_start, start)
-      elsif USE_TRUFFLE_REGEX || USE_TRUFFLE_REGEX_WITH_WARN
+      elsif USE_TRUFFLE_REGEX
         match_in_region_tregex(re, str, from, to, at_start, start)
       else
         Primitive.regexp_match_in_region(re, str, from, to, at_start, start)
@@ -116,8 +116,8 @@ def self.match_in_region_tregex(re, str, from, to, at_start, start)
         regex_result = compiled_regex.execBytes(str_bytes, from)
       end
       if bail_out
-        if USE_TRUFFLE_REGEX_WITH_WARN
-          warn "match_in_region_tregex(/#{re}/, \"#{str}\"@#{str.encoding}, #{from}, #{to}, #{at_start}, #{encoding_conversion}, #{start}) can’t be run as a Truffle regexp and fell back to Joni"
+        if WARN_TRUFFLE_REGEX_FALLBACK
+          warn "match_in_region_tregex(#{re.inspect}, #{str.inspect}@#{str.encoding}, #{from}, #{to}, #{at_start}, #{encoding_conversion}, #{start}) can't be run as a Truffle regexp and fell back to Joni"
         end
         return Primitive.regexp_match_in_region(re, str, from, to, at_start, start)
       elsif regex_result.isMatch

src/options.yml

@@ -144,7 +144,7 @@ EXPERT:
 
     # Controlling the regular expression engines
     USE_TRUFFLE_REGEX: [use-truffle-regex, boolean, false, 'Use the Truffle regular expression engine for Regexp objects']
-    USE_TRUFFLE_REGEX_WITH_WARN: [use-truffle-regex-with-warn, boolean, false, 'Use the Truffle regular expression engine for Regexp objects and warn when falling back to Joni']
+    WARN_TRUFFLE_REGEX_FALLBACK: [warn-truffle-regex-fallback, boolean, false, 'Warn when Truffle Regex could not be used for a Regexp and instead Joni is used']
 
 INTERNAL: # Options for debugging the TruffleRuby implementation
   EXPERIMENTAL:

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

@@ -83,7 +83,7 @@ public class OptionsCatalog {
     public static final OptionKey<Boolean> WARN_DEPRECATED_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> WARN_EXPERIMENTAL_KEY = new OptionKey<>(true);
     public static final OptionKey<Boolean> USE_TRUFFLE_REGEX_KEY = new OptionKey<>(false);
-    public static final OptionKey<Boolean> USE_TRUFFLE_REGEX_WITH_WARN_KEY = new OptionKey<>(false);
+    public static final OptionKey<Boolean> WARN_TRUFFLE_REGEX_FALLBACK_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> ARGV_GLOBALS_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> CHOMP_LOOP_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> GETS_LOOP_KEY = new OptionKey<>(false);
@@ -597,9 +597,9 @@ public class OptionsCatalog {
             .stability(OptionStability.EXPERIMENTAL)
             .build();
 
-    public static final OptionDescriptor USE_TRUFFLE_REGEX_WITH_WARN = OptionDescriptor
-            .newBuilder(USE_TRUFFLE_REGEX_WITH_WARN_KEY, "ruby.use-truffle-regex-with-warn")
-            .help("Use the Truffle regular expression engine for Regexp objects and warn when falling back to Joni")
+    public static final OptionDescriptor WARN_TRUFFLE_REGEX_FALLBACK = OptionDescriptor
+            .newBuilder(WARN_TRUFFLE_REGEX_FALLBACK_KEY, "ruby.warn-truffle-regex-fallback")
+            .help("Warn when Truffle Regex could not be used for a Regexp and instead Joni is used")
             .category(OptionCategory.EXPERT)
             .stability(OptionStability.EXPERIMENTAL)
             .build();
@@ -1229,8 +1229,8 @@ public static OptionDescriptor fromName(String name) {
                 return WARN_EXPERIMENTAL;
             case "ruby.use-truffle-regex":
                 return USE_TRUFFLE_REGEX;
-            case "ruby.use-truffle-regex-with-warn":
-                return USE_TRUFFLE_REGEX_WITH_WARN;
+            case "ruby.warn-truffle-regex-fallback":
+                return WARN_TRUFFLE_REGEX_FALLBACK;
             case "ruby.argv-globals":
                 return ARGV_GLOBALS;
             case "ruby.chomp-loop":
@@ -1443,7 +1443,7 @@ public static OptionDescriptor[] allDescriptors() {
             WARN_DEPRECATED,
             WARN_EXPERIMENTAL,
             USE_TRUFFLE_REGEX,
-            USE_TRUFFLE_REGEX_WITH_WARN,
+            WARN_TRUFFLE_REGEX_FALLBACK,
             ARGV_GLOBALS,
             CHOMP_LOOP,
             GETS_LOOP,