jruby · Feb 23, 2016 · Feb 23, 2016 · Feb 23, 2016
Showing with 18 additions and 3 deletions.

+10 −1 core/src/main/java/org/jruby/RubyNumeric.java

+3 −2 core/src/main/java/org/jruby/RubyString.java

+5 −0 core/src/main/java/org/jruby/util/Sprintf.java
diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -51,6 +51,7 @@
 import org.jruby.util.ByteList;
 import org.jruby.util.ConvertBytes;
 import org.jruby.util.ConvertDouble;
+import org.jruby.util.TypeConverter;
 
 import java.math.BigInteger;
 
@@ -267,10 +268,18 @@ public static double num2dbl(IRubyObject arg) {
             }
         }
 
-        IRubyObject val = f_to_f(runtime.getCurrentContext(), arg);
+        IRubyObject val = numericToFloat(runtime, arg);
         return ((RubyFloat) val).getDoubleValue();
     }
 
+    private static IRubyObject numericToFloat(Ruby runtime, IRubyObject num) {
+        if (!(num instanceof RubyNumeric)) {
+            throw runtime.newTypeError("can't convert " + num.getType() + " into Float");
+        }
+
+        return TypeConverter.convertToType(num, runtime.getFloat(), "to_f");
+    }
+
     /** rb_dbl_cmp (numeric.c)
      *
      */

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -1467,7 +1467,7 @@ public RubyString reverse_bang19(ThreadContext context) {
 
             Encoding enc = value.getEncoding();
             // this really needs to be inlined here
-            if (singleByteOptimizable(enc)) {
+            if (singleByteOptimizable()) {
                 for (int i = 0; i < len >> 1; i++) {
                     byte b = bytes[p + i];
                     bytes[p + i] = bytes[p + len - i - 1];
@@ -1476,12 +1476,13 @@ public RubyString reverse_bang19(ThreadContext context) {
             } else if (cr == CR_VALID) {
                 byte[] obytes = new byte[len];
                 while (p < end) {
-                    int cl = StringSupport.length(enc, bytes, p, end);
+                    int cl = StringSupport.encFastMBCLen(bytes, p, end, enc);
 
                     op -= cl;
                     System.arraycopy(bytes, p, obytes, op, cl);
                     p += cl;
                 }
+                value.setUnsafeBytes(obytes);
             } else {
                 byte[] obytes = new byte[len];
                 cr = enc.isAsciiCompatible() ? CR_7BIT : CR_VALID;

diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -170,6 +170,11 @@ IRubyObject next(ByteList name) {
                         object = object.callMethod(runtime.getCurrentContext(), "call", nameSym);
                     }
                 }
+
+                if (object.isNil()) {
+                    throw runtime.newKeyError("key " + nameSym + " not found");
+                }
+
                 return object;
             } else if (rubyHash != null) {
                 raiseArgumentError("positional args mixed with named args");