[Truffle] Fix String#[start,len].

* Inspired by Array#[].
jruby · Jan 13, 2015 · 2ce0e73 · 2ce0e73
1 parent 2bb1f45
commit 2ce0e73
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -15,6 +15,7 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
+
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 import org.joni.Matcher;
@@ -29,6 +30,7 @@
 import org.jruby.truffle.runtime.UndefinedPlaceholder;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.*;
+import org.jruby.truffle.runtime.util.ArrayUtils;
 import org.jruby.util.ByteList;
 import org.jruby.util.Pack;
 import org.jruby.util.StringSupport;
@@ -187,6 +189,8 @@ private RubyString formatSlow(RubyString format, Object[] args) {
     @CoreMethod(names = {"[]", "slice"}, required = 1, optional = 1, lowerFixnumParameters = {0, 1})
     public abstract static class GetIndexNode extends CoreMethodNode {
 
+        private final BranchProfile outOfBounds = BranchProfile.create();
+
         public GetIndexNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
@@ -213,20 +217,22 @@ public Object getIndex(RubyString string, int index, UndefinedPlaceholder undefi
             final ByteList bytes = string.getBytes();
 
             if (normalisedIndex < 0 || normalisedIndex >= bytes.length()) {
+                outOfBounds.enter();
                 return getContext().getCoreLibrary().getNilObject();
             } else {
                 return getContext().makeString(bytes.charAt(normalisedIndex));
             }
         }
 
         @Specialization
-        public Object getIndex(RubyString string, RubyRange.IntegerFixnumRange range, UndefinedPlaceholder undefined) {
+        public Object slice(RubyString string, RubyRange.IntegerFixnumRange range, UndefinedPlaceholder undefined) {
             notDesignedForCompilation();
 
             final String javaString = string.toString();
             final int begin = string.normaliseIndex(range.getBegin());
 
-            if (begin < 0 || begin >= javaString.length()) {
+            if (begin < 0 || begin > javaString.length()) {
+                outOfBounds.enter();
                 return getContext().getCoreLibrary().getNilObject();
             } else {
                 final int end = string.normaliseIndex(range.getEnd());
@@ -237,13 +243,19 @@ public Object getIndex(RubyString string, RubyRange.IntegerFixnumRange range, Un
         }
 
         @Specialization
-        public RubyString getIndex(RubyString string, int start, int length) {
+        public Object slice(RubyString string, int start, int length) {
             // TODO(CS): not sure if this is right - encoding
-            // TODO(CS): why does subSequence return CharSequence?
+            final ByteList bytes = string.getBytes();
             final int begin = string.normaliseIndex(start);
-            final int exclusiveEnd = string.normaliseIndex(begin + length);
-
-            return new RubyString(getContext().getCoreLibrary().getStringClass(), (ByteList) string.getBytes().subSequence(begin, exclusiveEnd));
+
+            if (begin < 0 || begin > bytes.length() || length < 0) {
+                outOfBounds.enter();
+                return getContext().getCoreLibrary().getNilObject();
+            } else {
+                final int end = Math.min(bytes.length(), begin + length);
+
+                return new RubyString(getContext().getCoreLibrary().getStringClass(), new ByteList(bytes, begin, end - begin));
+            }
         }
 
     }
@@ -868,8 +880,9 @@ public RubyString insert(RubyString string, int index, RubyString otherString) {
                 throw new RaiseException(getContext().getCoreLibrary().indexError(String.format("index %d out of string", index), this));
             }
 
-            RubyString firstPart = getIndexNode.getIndex(string, 0, index);
-            RubyString secondPart = getIndexNode.getIndex(string, index, string.length());
+            // TODO (Kevin): using node directly and cast
+            RubyString firstPart = (RubyString) getIndexNode.slice(string, 0, index);
+            RubyString secondPart = (RubyString) getIndexNode.slice(string, index, string.length());
 
             RubyString concatenated = concatNode.concat(concatNode.concat(firstPart, otherString), secondPart);