fix regexp warnings

jruby · Feb 20, 2018 · d20b9f7 · d20b9f7
1 parent b22e2ce
commit d20b9f7
Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -80,6 +80,7 @@
 
 import org.jcodings.Encoding;
 import org.joda.time.DateTimeZone;
+import org.joni.WarnCallback;
 import org.jruby.ast.Node;
 import org.jruby.ast.RootNode;
 import org.jruby.ast.executable.RuntimeCache;
@@ -2839,6 +2840,10 @@ public RubyWarnings getWarnings() {
         return warnings;
     }
 
+    WarnCallback getRegexpWarnings() {
+        return regexpWarnings;
+    }
+
     public PrintStream getErrorStream() {
         // FIXME: We can't guarantee this will always be a RubyIO...so the old code here is not safe
         /*java.io.OutputStream os = ((RubyIO) getGlobalVariables().getService("$stderr")).getOutStream();
@@ -5050,6 +5055,12 @@ private MRIRecursionGuard oldRecursionGuard() {
 
     private GlobalVariables globalVariables = new GlobalVariables(this);
     private final RubyWarnings warnings = new RubyWarnings(this);
+    private final WarnCallback regexpWarnings = new WarnCallback() {
+        @Override
+        public void warn(String message) {
+            getWarnings().warning(message);
+        }
+    };
 
     // Contains a list of all blocks (as Procs) that should be called when
     // the runtime environment exits.

diff --git a/core/src/main/java/org/jruby/RubyRegexp.java b/core/src/main/java/org/jruby/RubyRegexp.java
@@ -148,7 +148,7 @@ public Encoding getMarshalEncoding() {
     private static Regex makeRegexp(Ruby runtime, ByteList bytes, RegexpOptions options, Encoding enc) {
         try {
             int p = bytes.getBegin();
-            return new Regex(bytes.getUnsafeBytes(), p, p + bytes.getRealSize(), options.toJoniOptions(), enc, Syntax.DEFAULT, runtime.getWarnings());
+            return new Regex(bytes.getUnsafeBytes(), p, p + bytes.getRealSize(), options.toJoniOptions(), enc, Syntax.DEFAULT, runtime.getRegexpWarnings());
         } catch (Exception e) {
             RegexpSupport.raiseRegexpError19(runtime, bytes, enc, options, e.getMessage());
             return null; // not reached