[Truffle] Don't destroy the last regular expression match when we rea…

…ch the end of searching in String#scan.
jruby · Jan 8, 2015 · b63047d · b63047d · nirvdrum · Jan 8, 2015
1 parent 2e55827
commit b63047d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java b/core/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java
@@ -310,6 +310,8 @@ public Object scan(RubyString string) {
         int end = 0;
         int range = p + string.getBytes().getRealSize();
 
+        Object lastGoodMatchData = getContext().getCoreLibrary().getNilObject();
+
         if (regex.numberOfCaptures() == 0) {
             final ArrayList<RubyString> strings = new ArrayList<>();
 
@@ -327,9 +329,11 @@ public Object scan(RubyString string) {
 
                 strings.add((RubyString) values[0]);
 
+                lastGoodMatchData = matchData;
                 end = StringSupport.positionEndForScan(string.getBytes(), matcher, encoding, p, range);
             }
 
+            setThread("$~", lastGoodMatchData);
             return strings.toArray(new RubyString[strings.size()]);
         } else {
             final List<RubyArray> allMatches = new ArrayList<>();
@@ -344,9 +348,11 @@ public Object scan(RubyString string) {
                 allMatches.add(RubyArray.fromObjects(getContext().getCoreLibrary().getArrayClass(),
                         ((RubyMatchData) matchData).getCaptures()));
 
+                lastGoodMatchData = matchData;
                 end = StringSupport.positionEndForScan(string.getBytes(), matcher, encoding, p, range);
             }
 
+            setThread("$~", lastGoodMatchData);
             return allMatches.toArray(new Object[allMatches.size()]);
         }
     }