Merge pull request jruby#8548 from enebo/regex

tcification of regex
headius · Dec 26, 2024 · 7dfd5a1 · 7dfd5a1
2 parents 3c88b28 + ce0c411
commit 7dfd5a1
Show file tree

Hide file tree

Showing 13 changed files with 393 additions and 341 deletions.
diff --git a/core/src/main/java/org/jruby/RubyComplex.java b/core/src/main/java/org/jruby/RubyComplex.java
@@ -1289,8 +1289,8 @@ static IRubyObject[] str_to_c_internal(ThreadContext context, RubyString str) {
 
         if (m != nil) {
             RubyMatchData match = (RubyMatchData)m;
-            sr = match.at(1);
-            si = match.at(2);
+            sr = match.at(context, 1);
+            si = match.at(context, 2);
             re = match.post_match(context);
             po = true;
         }
@@ -1301,9 +1301,9 @@ static IRubyObject[] str_to_c_internal(ThreadContext context, RubyString str) {
             if (m != nil) {
                 RubyMatchData match = (RubyMatchData)m;
                 sr = nil;
-                si = match.at(1);
+                si = match.at(context, 1);
                 if (si == nil) si = runtime.newString();
-                IRubyObject t = match.at(2);
+                IRubyObject t = match.at(context, 2);
                 if (t == nil) t = runtime.newString(RubyInteger.singleCharByteList((byte) '1'));
                 ((RubyString) (si = si.convertToString())).cat(t.convertToString());
                 re = match.post_match(context);
@@ -1315,12 +1315,12 @@ static IRubyObject[] str_to_c_internal(ThreadContext context, RubyString str) {
             m = RubyRegexp.newDummyRegexp(runtime, Numeric.ComplexPatterns.comp_pat2).match_m(context, str, false);
             if (m == nil) return new IRubyObject[] { context.nil, str };
             RubyMatchData match = (RubyMatchData) m;
-            sr = match.at(1);
-            if (match.at(2) == nil) {
+            sr = match.at(context, 1);
+            if (match.at(context, 2) == nil) {
                 si = context.nil;
             } else {
-                si = match.at(3);
-                IRubyObject t = match.at(4);
+                si = match.at(context, 3);
+                IRubyObject t = match.at(context, 4);
                 if (t == nil) t = runtime.newString(RubyInteger.singleCharByteList((byte) '1'));
                 ((RubyString) (si = si.convertToString())).cat(t.convertToString());
             }

diff --git a/core/src/main/java/org/jruby/RubyGlobal.java b/core/src/main/java/org/jruby/RubyGlobal.java
@@ -918,7 +918,8 @@ public PreMatchGlobalVariable(Ruby runtime, String name) {
 
         @Override
         public IRubyObject get() {
-            return RubyRegexp.match_pre(runtime.getCurrentContext().getBackRef());
+            var context = runtime.getCurrentContext();
+            return RubyRegexp.match_pre(context, context.getBackRef());
         }
     }
 
@@ -940,7 +941,8 @@ public LastMatchGlobalVariable(Ruby runtime, String name) {
 
         @Override
         public IRubyObject get() {
-            return RubyRegexp.match_last(runtime.getCurrentContext().getBackRef());
+            var context = runtime.getCurrentContext();
+            return RubyRegexp.match_last(context, context.getBackRef());
         }
     }