[Truffle] Fixed bad implementation of MatchData#captures.

jruby · Jan 8, 2015 · 1a36da4 · 1a36da4 · nirvdrum · Jan 8, 2015
1 parent fb4b3b8
commit 1a36da4
Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java
@@ -15,6 +15,7 @@
 import org.jruby.truffle.runtime.core.RubyArray;
 import org.jruby.truffle.runtime.core.RubyMatchData;
 import org.jruby.truffle.runtime.core.RubyString;
+import org.jruby.truffle.runtime.util.ArrayUtils;
 
 @CoreClass(name = "MatchData")
 public abstract class MatchDataNodes {
@@ -43,6 +44,29 @@ public Object getIndex(RubyMatchData matchData, int index) {
 
     }
 
+    @CoreMethod(names = "captures")
+    public abstract static class CapturesNode extends CoreMethodNode {
+
+        public CapturesNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public CapturesNode(CapturesNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public RubyArray toA(RubyMatchData matchData) {
+            notDesignedForCompilation();
+
+            Object[] values = matchData.getValues();
+
+            // There should always be at least one value because the entire matched string will be in the array. Thus,
+            // there is no risk of an ArrayIndexOutOfBoundsException here.
+            return RubyArray.fromObjects(getContext().getCoreLibrary().getArrayClass(), ArrayUtils.extractRange(values, 1, values.length));
+        }
+    }
+
     @CoreMethod(names = "pre_match")
     public abstract static class PreMatchNode extends CoreMethodNode {
 
@@ -79,7 +103,7 @@ public RubyString postMatch(RubyMatchData matchData) {
 
     }
 
-    @CoreMethod(names = {"to_a", "captures"})
+    @CoreMethod(names = "to_a")
     public abstract static class ToANode extends CoreMethodNode {
 
         public ToANode(RubyContext context, SourceSection sourceSection) {
@@ -96,7 +120,6 @@ public RubyArray toA(RubyMatchData matchData) {
 
             return RubyArray.fromObjects(getContext().getCoreLibrary().getArrayClass(), matchData.getValues());
         }
-
     }
 
     @CoreMethod(names = "values_at", argumentsAsArray = true)

diff --git a/spec/truffle/tags/core/matchdata/captures_tags.txt b/spec/truffle/tags/core/matchdata/captures_tags.txt