separate implementation for match? for #5256

lopex · lopex · commit a4eacdd797b0 · 2018-07-31T20:37:13.000+02:00
diff --git a/core/src/main/java/org/jruby/RubyRegexp.java b/core/src/main/java/org/jruby/RubyRegexp.java
@@ -1136,14 +1136,12 @@ public IRubyObject match_m(ThreadContext context, IRubyObject str, IRubyObject p
 
     @JRubyMethod(name = "match?")
     public IRubyObject match_p(ThreadContext context, IRubyObject str) {
-        IRubyObject[] dummy = new IRubyObject[1];
-        return context.runtime.newBoolean(matchPos(context, str, null, dummy, 0) >= 0);
+        return matchP(context, str, 0);
     }
 
     @JRubyMethod(name = "match?")
     public IRubyObject match_p(ThreadContext context, IRubyObject str, IRubyObject pos) {
-        IRubyObject[] dummy = new IRubyObject[1];
-        return context.runtime.newBoolean(matchPos(context, str, null, dummy, RubyNumeric.num2int(pos)) >= 0);
+        return matchP(context, str, RubyNumeric.num2int(pos));
     }
 
     private IRubyObject matchCommon(ThreadContext context, IRubyObject str, int pos, boolean setBackref, Block block) {
@@ -1183,6 +1181,35 @@ private int matchPos(ThreadContext context, IRubyObject arg, RubyString[] strp,
         return search(context, str, pos, false, holder);
     }
 
+    private RubyBoolean matchP(ThreadContext context, IRubyObject arg, int pos) {
+        if (arg == context.nil) return context.fals;
+        RubyString str = arg instanceof RubySymbol ? ((RubySymbol) arg).to_s(context.runtime) : arg.convertToString();
+
+        if (pos != 0) {
+            if (pos < 0) {
+                pos += str.strLength();
+                if (pos < 0) return context.fals;
+            }
+            pos = str.rbStrOffset(pos);
+        }
+
+        final Regex reg = preparePattern(str);
+
+        final ByteList strBL = str.getByteList();
+        final int beg = strBL.begin();
+
+        Matcher matcher = reg.matcherNoRegion(strBL.unsafeBytes(), beg, beg + strBL.realSize());
+
+        int result;
+        try {
+            result = matcherSearch(context, matcher, beg + pos, beg + strBL.realSize(), RE_OPTION_NONE);
+        } catch (JOniException je) {
+            throw context.runtime.newRegexpError(je.getMessage());
+        }
+
+        return result == -1 ? context.fals : context.tru;
+    }
+
     /**
      * MRI: rb_reg_search
      *
