jruby · Jun 10, 2015 · Jun 10, 2015
Showing with 7 additions and 10 deletions.

+0 −8 spec/truffle/tags/core/string/rindex_tags.txt

+0 −1 spec/truffle/tags/core/string/rpartition_tags.txt

+7 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
diff --git a/spec/truffle/tags/core/string/rindex_tags.txt b/spec/truffle/tags/core/string/rindex_tags.txt
diff --git a/spec/truffle/tags/core/string/rpartition_tags.txt b/spec/truffle/tags/core/string/rpartition_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
@@ -146,7 +146,13 @@ public Object searchRegion(RubyRegexp regexp, RubyString string, int start, int
             final Regex r = new Regex(preprocessed.getUnsafeBytes(), preprocessed.getBegin(), preprocessed.getBegin() + preprocessed.getRealSize(), regexp.getRegex().getOptions(), regexp.checkEncoding(StringNodes.getCodeRangeable(string), true));
             final Matcher matcher = r.matcher(StringNodes.getByteList(string).bytes());
 
-            return regexp.matchCommon(string, false, false, matcher, start, end);
+            if (forward) {
+                // Search forward through the string.
+                return regexp.matchCommon(string, false, false, matcher, start, end);
+            } else {
+                // Search backward through the string.
+                return regexp.matchCommon(string, false, false, matcher, end, start);
+            }
         }
 
     }