jruby · Apr 11, 2015 · Apr 11, 2015 · Apr 11, 2015
diff --git a/core/src/main/java/org/jruby/RubyArray.java b/core/src/main/java/org/jruby/RubyArray.java
@@ -4128,6 +4128,8 @@ public RubyString pack(ThreadContext context, IRubyObject obj) {
                 throw context.getRuntime().newRangeError(e.getMessage());
             } catch (CantConvertException e) {
                 throw context.getRuntime().newTypeError(e.getMessage());
+            } catch (WrongArgumentTypeException e) {
+                throw context.getRuntime().newTypeError("wrong argument type " + e.getGot() + " (expected " + e.getExpected() + ")");
             }
 
             final RubyString string = context.getRuntime().newString(new ByteList(result.getOutput(), 0, result.getOutputLength()));

diff --git a/core/src/main/java/org/jruby/truffle/pack/runtime/exceptions/WrongArgumentTypeException.java b/core/src/main/java/org/jruby/truffle/pack/runtime/exceptions/WrongArgumentTypeException.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.pack.runtime.exceptions;
+
+public class WrongArgumentTypeException extends RuntimeException {
+
+    private final String got;
+    private final String expected;
+
+    public WrongArgumentTypeException(String got, String expected) {
+        this.got = got;
+        this.expected = expected;
+    }
+
+    public String getGot() {
+        return got;
+    }
+
+    public String getExpected() {
+        return expected;
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/pack/nodes/read/ReadDoubleNode.java b/truffle/src/main/java/org/jruby/truffle/pack/nodes/read/ReadDoubleNode.java
@@ -17,6 +17,7 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.truffle.pack.nodes.PackNode;
 import org.jruby.truffle.pack.nodes.SourceNode;
+import org.jruby.truffle.pack.runtime.exceptions.WrongArgumentTypeException;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**
@@ -65,7 +66,11 @@ public double read(VirtualFrame frame, IRubyObject[] source) {
 
     @CompilerDirectives.TruffleBoundary
     private double toDouble(IRubyObject object) {
-        return object.convertToFloat().getDoubleValue();
+        if (object.isNil()) {
+            throw new WrongArgumentTypeException("NilClass", "Float");
+        } else {
+            return object.convertToFloat().getDoubleValue();
+        }
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/pack/nodes/read/ReadLongOrBigIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/pack/nodes/read/ReadLongOrBigIntegerNode.java
@@ -15,6 +15,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.utilities.ConditionProfile;
+import org.jruby.RubyInteger;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.truffle.pack.nodes.PackNode;
 import org.jruby.truffle.pack.nodes.SourceNode;
@@ -88,13 +89,19 @@ public Object read(VirtualFrame frame, Object[] source) {
     }
 
     @Specialization
-    public long read(VirtualFrame frame, IRubyObject[] source) {
-        return toLong(source[advanceSourcePosition(frame)]);
+    public Object read(VirtualFrame frame, IRubyObject[] source) {
+        return toLongOrBigInteger(source[advanceSourcePosition(frame)]);
     }
 
     @CompilerDirectives.TruffleBoundary
-    private long toLong(IRubyObject object) {
-        return object.convertToInteger().getLongValue();
+    private Object toLongOrBigInteger(IRubyObject object) {
+        final RubyInteger integer = object.convertToInteger();
+
+        if (integer instanceof org.jruby.RubyBignum) {
+            return integer.getBigIntegerValue().longValue();
+        } else {
+            return integer.getLongValue();
+        }
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/pack/nodes/read/ReadStringNode.java b/truffle/src/main/java/org/jruby/truffle/pack/nodes/read/ReadStringNode.java
@@ -88,12 +88,18 @@ private Object readAndConvert(VirtualFrame frame, Object value) {
 
     @Specialization
     public ByteList read(VirtualFrame frame, IRubyObject[] source) {
-        return toString(source[advanceSourcePosition(frame)]);
+        final org.jruby.RubyString string = toString(source[advanceSourcePosition(frame)]);
+
+        if (string.isTaint()) {
+            setTainted(frame);
+        }
+
+        return string.getByteList();
     }
 
     @CompilerDirectives.TruffleBoundary
-    private ByteList toString(IRubyObject object) {
-        return object.convertToString().getByteList();
+    private org.jruby.RubyString toString(IRubyObject object) {
+        return object.convertToString();
     }
 
 }