[Truffle] Implemented String#[](String).

jruby · Mar 2, 2015 · ebd6f90 · eregon · Mar 3, 2015 · nirvdrum
1 parent b27513d
commit ebd6f90
Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/spec/truffle/tags/core/string/slice_tags.txt b/spec/truffle/tags/core/string/slice_tags.txt
@@ -14,11 +14,7 @@ fails:String#slice with Regexp, index returns nil if there is no capture for the
 fails:String#slice with Regexp, index returns subclass instances
 fails:String#slice with Regexp, group always taints resulting strings when self or regexp is tainted
 fails:String#slice with Regexp, group returns subclass instances
-fails:String#slice with String returns other_str if it occurs in self
 fails:String#slice with String taints resulting strings when other is tainted
-fails:String#slice with String doesn't set $~
-fails:String#slice with String returns nil if there is no match
-fails:String#slice with String returns a subclass instance when given a subclass instance
 fails:String#slice! with index calls to_int on index
 fails:String#slice! with index returns the character given by the character index
 fails:String#slice! with index, length deletes and returns the substring at idx and the given length
@@ -46,7 +42,6 @@ fails:String#slice! with Regexp, index returns subclass instances
 fails:String#slice! with String removes and returns the first occurrence of other_str from self
 fails:String#slice! with String taints resulting strings when other is tainted
 fails:String#slice! with String doesn't set $~
-fails:String#slice! with String returns nil if self does not contain other
 fails:String#slice! with String returns a subclass instance when given a subclass instance
 fails:String#slice! with Regexp, index accepts a Float for capture index
 fails:String#slice! with Regexp, index calls #to_int to convert an Object to capture index
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -285,6 +285,8 @@ public abstract static class GetIndexNode extends CoreMethodNode {
 
         @Child private ToIntNode toIntNode;
         @Child private MatchDataNodes.GetIndexNode getMatchDataIndexNode;
+        @Child private CallDispatchHeadNode includeNode;
+        @Child private KernelNodes.DupNode dupNode;
 
         private final BranchProfile outOfBounds = BranchProfile.create();
 
@@ -454,6 +456,29 @@ public Object slice(VirtualFrame frame, RubyString string, RubyRegexp regexp, Ob
 
             return getMatchDataIndexNode.getIndex((RubyMatchData) matchData, index);
         }
+
+        @Specialization
+        public Object slice(VirtualFrame frame, RubyString string, RubyString matchStr, @SuppressWarnings("unused") UndefinedPlaceholder undefined) {
+            notDesignedForCompilation();
+
+            if (includeNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                includeNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
+            }
+
+            Boolean result = (Boolean) includeNode.call(frame, string, "include?", null, matchStr);
+
+            if (result) {
+                if (dupNode == null) {
+                    CompilerDirectives.transferToInterpreter();
+                    dupNode = insert(KernelNodesFactory.DupNodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{}));
+                }
+
+                return dupNode.dup(frame, matchStr);
+            }
+
+            return getContext().getCoreLibrary().getNilObject();
+        }
     }
 
     @CoreMethod(names = "[]=", required = 2, lowerFixnumParameters = 0)