jruby · Mar 29, 2015 · Mar 29, 2015 · Mar 29, 2015 · Mar 29, 2015
Showing with 18 additions and 8 deletions.

+16 −6 core/src/main/java/org/jruby/RubyString.java

+1 −1 core/src/main/java/org/jruby/util/StringSupport.java

+1 −1 core/src/main/java/org/jruby/util/TypeConverter.java
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -2343,7 +2343,7 @@ public IRubyObject sub_bang19(ThreadContext context, IRubyObject arg0, IRubyObje
         if (hash.isNil()) {
             return subBangNoIter19(runtime, context, pattern, prepared, arg1.convertToString(), regexp);
         } else {
-            return subBangIter19(runtime, context, pattern, prepared, (RubyHash)hash, block, regexp);
+            return subBangIter19(runtime, context, pattern, prepared, (RubyHash) hash, block, regexp);
         }
     }
 
@@ -3456,8 +3456,8 @@ public RubyArray split19(ThreadContext context, IRubyObject arg0, IRubyObject ar
         }
     }
 
-    public RubyArray split19(ThreadContext context, IRubyObject arg0, boolean useBackref) {
-        return splitCommon19(arg0, useBackref, flags, flags, context, useBackref);
+    public RubyArray split19(IRubyObject spat, ThreadContext context, boolean useBackref) {
+        return splitCommon19(spat, false, value.realSize(), 0, context, useBackref);
     }
 
     // MRI: rb_str_split_m, overall structure
@@ -3517,8 +3517,9 @@ private RubyArray regexSplit19(ThreadContext context, RubyRegexp pattern, boolea
         int end, beg = 0;
         boolean lastNull = false;
         int start = beg;
-        while ((end = pattern.search19(context, this, start, false)) >= 0) {
-            RubyMatchData match = (RubyMatchData)context.getBackRef();
+        IRubyObject[] holder = useBackref ? null : new IRubyObject[]{context.nil};
+        while ((end = pattern.search19(context, this, start, false, holder)) >= 0) {
+            RubyMatchData match = useBackref ? (RubyMatchData)context.getBackRef() : (RubyMatchData)holder[0];
             if (start == end && match.begin(0) == match.end(0)) {
                 if (len == 0) {
                     result.append(newEmptyString(runtime, getMetaClass()).infectBy(this));
@@ -3547,7 +3548,11 @@ private RubyArray regexSplit19(ThreadContext context, RubyRegexp pattern, boolea
         }
 
         // only this case affects backrefs
-        if (useBackref) context.setBackRef(runtime.getNil());
+        if (useBackref) {
+            context.setBackRef(runtime.getNil());
+        } else {
+            holder[0] = context.nil;
+        }
 
         if (len > 0 && (limit || len > beg || lim < 0)) result.append(makeShared19(runtime, beg, len - beg));
         return result;
@@ -6019,4 +6024,9 @@ final RubyString strDup(RubyClass clazz) {
     public final void modify19(int length) {
         modifyExpand(length);
     }
+
+    @Deprecated
+    public RubyArray split19(ThreadContext context, IRubyObject arg0, boolean useBackref) {
+        return splitCommon19(arg0, useBackref, flags, flags, context, useBackref);
+    }
 }
diff --git a/core/src/main/java/org/jruby/util/StringSupport.java b/core/src/main/java/org/jruby/util/StringSupport.java
@@ -911,7 +911,7 @@ public static int rindex(ByteList source, int sourceChars, int subChars, int pos
         }
 
         int s = nth(enc, sourceBytes, sbeg, end, pos);
-        byte[] subBytes = subString.bytes();
+        byte[] subBytes = subString.unsafeBytes();
 
         // switch to byte size here; this is now MRI:str_rindex
         if (subSize == 0) return pos;

diff --git a/core/src/main/java/org/jruby/util/TypeConverter.java b/core/src/main/java/org/jruby/util/TypeConverter.java
@@ -299,7 +299,7 @@ public static void checkType(ThreadContext context, IRubyObject x, RubyModule t)
         if (xt != t.getClassIndex()) {
             String tname = t.getBaseName();
             if (tname != null) {
-                throw context.runtime.newArgumentError("wrong argument type " + xt + " (expected " + t.getClassIndex());
+                throw context.runtime.newTypeError("wrong argument type " + tname + " (expected " + t.getName() + ")");
             }
             throw context.runtime.newRuntimeError("bug: unknown type " + t.getClassIndex() + " (" + xt + " given)");
         }