jruby · Jun 10, 2015 · Jun 10, 2015 · Jun 10, 2015 · Jun 10, 2015 · Jun 10, 2015
diff --git a/core/src/main/java/org/jruby/RubyMatchData.java b/core/src/main/java/org/jruby/RubyMatchData.java
@@ -50,6 +50,7 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
+import org.jruby.util.ByteListHolder;
 import org.jruby.util.StringSupport;
 
 /**
@@ -398,7 +399,7 @@ private int nameToBackrefNumber(RubyString str) {
         return nameToBackrefNumber(getRuntime(), pattern, regs, str);
     }
 
-    private static int nameToBackrefNumber(Ruby runtime, Regex pattern, Region regs, RubyString str) {
+    private static int nameToBackrefNumber(Ruby runtime, Regex pattern, Region regs, ByteListHolder str) {
         if (pattern == null) {
             throw runtime.newIndexError("undefined group name reference: " + str);
         }

diff --git a/spec/truffle/tags/core/enumerable/chunk_tags.txt b/spec/truffle/tags/core/enumerable/chunk_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/cycle_tags.txt b/spec/truffle/tags/core/enumerable/cycle_tags.txt
@@ -1,4 +1,3 @@
-fails:Enumerable#cycle passed no argument or nil loops indefinitely
 fails:Enumerable#cycle Enumerable with size when no block is given returned Enumerator size should be the result of multiplying the enumerable size by the argument passed
 fails:Enumerable#cycle Enumerable with size when no block is given returned Enumerator size should be zero when the argument passed is 0 or less
 fails:Enumerable#cycle Enumerable with size when no block is given returned Enumerator size should be Float::INFINITY when no argument is passed
diff --git a/spec/truffle/tags/core/enumerable/slice_before_tags.txt b/spec/truffle/tags/core/enumerable/slice_before_tags.txt
diff --git a/spec/truffle/tags/core/string/element_set_tags.txt b/spec/truffle/tags/core/string/element_set_tags.txt
diff --git a/spec/truffle/tags/core/string/index_tags.txt b/spec/truffle/tags/core/string/index_tags.txt
diff --git a/spec/truffle/tags/core/string/match_tags.txt b/spec/truffle/tags/core/string/match_tags.txt
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/spec/truffle/tags/core/string/scan_tags.txt b/spec/truffle/tags/core/string/scan_tags.txt
diff --git a/spec/truffle/tags/core/string/split_tags.txt b/spec/truffle/tags/core/string/split_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
@@ -17,6 +17,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import com.oracle.truffle.api.utilities.ConditionProfile;
+import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
@@ -701,7 +702,7 @@ public ToSNode(RubyContext context, SourceSection sourceSection) {
         @TruffleBoundary
         @Specialization
         public RubyBasicObject toS(RubyBasicObject value, NotProvided base) {
-            return createString(getBigIntegerValue(value).toString());
+            return createString(getBigIntegerValue(value).toString(), USASCIIEncoding.INSTANCE);
         }
 
         @TruffleBoundary
@@ -712,7 +713,7 @@ public RubyBasicObject toS(RubyBasicObject value, int base) {
                 throw new RaiseException(getContext().getCoreLibrary().argumentErrorInvalidRadix(base, this));
             }
 
-            return createString(getBigIntegerValue(value).toString(base));
+            return createString(getBigIntegerValue(value).toString(base), USASCIIEncoding.INSTANCE);
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
@@ -16,6 +16,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import com.oracle.truffle.api.utilities.ConditionProfile;
+import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.runtime.NotProvided;
@@ -678,7 +679,7 @@ public ToSNode(RubyContext context, SourceSection sourceSection) {
         @TruffleBoundary
         @Specialization
         public RubyBasicObject toS(double value) {
-            return createString(Double.toString(value));
+            return createString(Double.toString(value), USASCIIEncoding.INSTANCE);
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java
@@ -21,6 +21,8 @@
 import org.jruby.truffle.nodes.coerce.ToIntNode;
 import org.jruby.truffle.nodes.coerce.ToIntNodeGen;
 import org.jruby.truffle.nodes.core.array.ArrayNodes;
+import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
+import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.runtime.NotProvided;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
@@ -193,6 +195,38 @@ public Object end(RubyMatchData matchData, int index) {
         }
     }
 
+    @RubiniusOnly
+    @CoreMethod(names = "full")
+    public abstract static class FullNode extends CoreMethodArrayArgumentsNode {
+
+        @Child private CallDispatchHeadNode newTupleNode;
+
+        public FullNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @Specialization
+        public Object full(VirtualFrame frame, RubyMatchData matchData) {
+            if (matchData.getFullTuple() != null) {
+                return matchData.getFullTuple();
+            }
+
+            if (newTupleNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                newTupleNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
+            }
+
+            final Object fullTuple = newTupleNode.call(frame,
+                    getContext().getCoreLibrary().getTupleClass(),
+                    "create",
+                    null, matchData.getFullBegin(), matchData.getFullEnd());
+
+            matchData.setFullTuple(fullTuple);
+
+            return fullTuple;
+        }
+    }
+
     @CoreMethod(names = {"length", "size"})
     public abstract static class LengthNode extends CoreMethodArrayArgumentsNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpGuards.java
@@ -10,7 +10,9 @@
 
 package org.jruby.truffle.nodes.core;
 
+import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyRegexp;
+import org.jruby.util.StringSupport;
 
 public class RegexpGuards {
 
@@ -22,4 +24,8 @@ public static boolean isRegexpLiteral(RubyRegexp regexp) {
         return regexp.getOptions().isLiteral();
     }
 
+    public static boolean isValidEncoding(RubyBasicObject string) {
+        return StringNodes.scanForCodeRange(string) != StringSupport.CR_BROKEN;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringGuards.java
@@ -25,8 +25,9 @@ public static boolean isAsciiCompatible(RubyString string) {
         return StringNodes.getByteList(string).getEncoding().isAsciiCompatible();
     }
 
-    public static boolean isSingleByteOptimizableOrAsciiCompatible(RubyString string) {
-        return isSingleByteOptimizable(string) || isAsciiCompatible(string);
+    public static boolean isSingleByteOptimizableOrAsciiOnly(RubyString string) {
+        // TODO (nirvdrnum 08-Jun-15) Rubinius tracks whether a String is ASCII-only via a field in the String.
+        return isSingleByteOptimizable(string);
     }
 
     public static boolean isSingleByte(RubyString string) {

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
@@ -39,8 +39,7 @@
 import org.jcodings.exception.EncodingException;
 import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.specific.USASCIIEncoding;
-import org.joni.Matcher;
-import org.joni.Option;
+import org.jcodings.specific.UTF8Encoding;
 import org.jruby.Ruby;
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.RubyNode;
@@ -245,11 +244,12 @@ public static RubyBasicObject createEmptyString(RubyClass stringClass) {
     }
 
     public static RubyBasicObject createString(RubyClass stringClass, String string) {
-        return createString(stringClass, string, USASCIIEncoding.INSTANCE);
+        return createString(stringClass, string, UTF8Encoding.INSTANCE);
     }
 
+    @TruffleBoundary
     public static RubyBasicObject createString(RubyClass stringClass, String string, Encoding encoding) {
-        return createString(stringClass, new ByteList(org.jruby.RubyEncoding.encodeUTF8(string), encoding, false));
+        return createString(stringClass, org.jruby.RubyString.encodeBytelist(string, encoding));
     }
 
     public static RubyBasicObject createString(RubyClass stringClass, byte[] bytes) {
@@ -745,19 +745,6 @@ protected boolean isRubiniusUndefined(Object object) {
 
     }
 
-    @CoreMethod(names = "=~", required = 1)
-    public abstract static class MatchOperatorNode extends CoreMethodArrayArgumentsNode {
-
-        public MatchOperatorNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
-        @Specialization
-        public Object match(RubyString string, RubyRegexp regexp) {
-            return regexp.matchCommon(string, true, false);
-        }
-    }
-
     @CoreMethod(names = "ascii_only?")
     public abstract static class ASCIIOnlyNode extends CoreMethodArrayArgumentsNode {
 
@@ -1520,28 +1507,6 @@ public Object lstripBang(RubyString string) {
         }
     }
 
-    @CoreMethod(names = "match", required = 1, taintFromSelf = true)
-    public abstract static class MatchNode extends CoreMethodArrayArgumentsNode {
-
-        @Child private CallDispatchHeadNode regexpMatchNode;
-
-        public MatchNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-            regexpMatchNode = DispatchHeadNodeFactory.createMethodCall(context);
-        }
-
-        @Specialization
-        public Object match(VirtualFrame frame, RubyString string, RubyString regexpString) {
-            final RubyRegexp regexp = new RubyRegexp(this, getContext().getCoreLibrary().getRegexpClass(), getByteList(regexpString), Option.DEFAULT);
-            return regexpMatchNode.call(frame, regexp, "match", null, string);
-        }
-
-        @Specialization
-        public Object match(VirtualFrame frame, RubyString string, RubyRegexp regexp) {
-            return regexpMatchNode.call(frame, regexp, "match", null, string);
-        }
-    }
-
     @RubiniusOnly
     @CoreMethod(names = "modify!", raiseIfFrozenSelf = true)
     public abstract static class ModifyBangNode extends CoreMethodArrayArgumentsNode {
@@ -1802,90 +1767,6 @@ private ByteList dumpCommon(RubyString string) {
         }
     }
 
-    @CoreMethod(names = "scan", required = 1, needsBlock = true, taintFromParameter = 0)
-    public abstract static class ScanNode extends YieldingCoreMethodNode {
-
-        public ScanNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
-        @Specialization
-        public RubyBasicObject scan(RubyString string, RubyString regexpString, NotProvided block) {
-            final RubyRegexp regexp = new RubyRegexp(this, getContext().getCoreLibrary().getRegexpClass(), getByteList(regexpString), Option.DEFAULT);
-            return scan(string, regexp, block);
-        }
-
-        @Specialization
-        public RubyBasicObject scan(VirtualFrame frame, RubyString string, RubyString regexpString, RubyProc block) {
-            final RubyRegexp regexp = new RubyRegexp(this, getContext().getCoreLibrary().getRegexpClass(), getByteList(regexpString), Option.DEFAULT);
-            return scan(frame, string, regexp, block);
-        }
-
-        @Specialization
-        public RubyBasicObject scan(RubyString string, RubyRegexp regexp, NotProvided block) {
-            return ArrayNodes.fromObjects(getContext().getCoreLibrary().getArrayClass(), (Object[]) regexp.scan(string));
-        }
-
-        @Specialization
-        public RubyBasicObject scan(VirtualFrame frame, RubyString string, RubyRegexp regexp, RubyProc block) {
-            CompilerDirectives.transferToInterpreter();
-
-            // TODO (nirvdrum 12-Jan-15) Figure out a way to make this not just a complete copy & paste of RubyRegexp#scan.
-
-            final RubyContext context = getContext();
-
-            final byte[] stringBytes = getByteList(string).bytes();
-            final Encoding encoding = getByteList(string).getEncoding();
-            final Matcher matcher = regexp.getRegex().matcher(stringBytes);
-
-            int p = getByteList(string).getBegin();
-            int end = 0;
-            int range = p + getByteList(string).getRealSize();
-
-            Object lastGoodMatchData = nil();
-
-            if (regexp.getRegex().numberOfCaptures() == 0) {
-                while (true) {
-                    Object matchData = regexp.matchCommon(string, false, true, matcher, p + end, range);
-
-                    if (matchData == context.getCoreLibrary().getNilObject()) {
-                        break;
-                    }
-
-                    RubyMatchData md = (RubyMatchData) matchData;
-                    Object[] values = md.getValues();
-
-                    assert values.length == 1;
-
-                    yield(frame, block, values[0]);
-
-                    lastGoodMatchData = matchData;
-                    end = StringSupport.positionEndForScan(getByteList(string), matcher, encoding, p, range);
-                }
-
-                regexp.setThread("$~", lastGoodMatchData);
-            } else {
-                while (true) {
-                    Object matchData = regexp.matchCommon(string, false, true, matcher, p + end, stringBytes.length);
-
-                    if (matchData == context.getCoreLibrary().getNilObject()) {
-                        break;
-                    }
-
-                    final Object[] captures = ((RubyMatchData) matchData).getCaptures();
-                    yield(frame, block, ArrayNodes.createArray(context.getCoreLibrary().getArrayClass(), captures, captures.length));
-
-                    lastGoodMatchData = matchData;
-                    end = StringSupport.positionEndForScan(getByteList(string), matcher, encoding, p, range);
-                }
-
-                regexp.setThread("$~", lastGoodMatchData);
-            }
-
-            return string;
-        }
-    }
-
     @CoreMethod(names = "setbyte", required = 2, raiseIfFrozenSelf = true)
     @NodeChildren({
         @NodeChild(type = RubyNode.class, value = "string"),