[Truffle] Raise the correct exception type if type cannot be coerced …

…into String.
jruby · Dec 5, 2014 · 87f93a1 · 87f93a1
1 parent 3c98a0f
commit 87f93a1
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -509,9 +509,20 @@ public Object eval(RubyString source, RubyBinding binding) {
         public Object eval(VirtualFrame frame, RubyBasicObject object, UndefinedPlaceholder binding) {
             notDesignedForCompilation();
 
-            RubyString coerced = (RubyString) toStr.call(frame, object, "to_str", null);
-
-            return getContext().eval(coerced.toString(), this);
+            try {
+                RubyString coerced = (RubyString) toStr.call(frame, object, "to_str", null);
+
+                return getContext().eval(coerced.toString(), this);
+            } catch (RaiseException e) {
+                if (e.getRubyException().getLogicalClass() == getContext().getCoreLibrary().getNoMethodErrorClass()) {
+                    throw new RaiseException(
+                            getContext().getCoreLibrary().typeError(
+                                    String.format("no implicit conversion of %s into String", object.getLogicalClass().getName()),
+                                    this));
+                } else {
+                    throw e;
+                }
+            }
         }
     }