jruby · Dec 9, 2014 · Dec 9, 2014 · Dec 9, 2014
Showing with 11 additions and 4 deletions.

+11 −2 core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java

+0 −1 spec/truffle/tags/core/kernel/eval_tags.txt

+0 −1 spec/truffle/tags/language/BEGIN_tags.txt
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
@@ -508,7 +508,7 @@ public Object eval(RubyString source, RubyBinding binding) {
             return getContext().eval(source.toString(), binding, this);
         }
 
-        @Specialization(guards = "!isString(arguments[0])")
+        @Specialization(guards = "!isRubyString(arguments[0])")
         public Object eval(VirtualFrame frame, RubyBasicObject object, @SuppressWarnings("unused") UndefinedPlaceholder binding) {
             notDesignedForCompilation();
 
@@ -518,7 +518,7 @@ public Object eval(VirtualFrame frame, RubyBasicObject object, @SuppressWarnings
             return eval(frame, object, defaultBinding);
         }
 
-        @Specialization(guards = "!isString(arguments[0])")
+        @Specialization(guards = "!isRubyString(arguments[0])")
         public Object eval(VirtualFrame frame, RubyBasicObject object, RubyBinding binding) {
             notDesignedForCompilation();
 
@@ -549,6 +549,15 @@ public Object eval(VirtualFrame frame, RubyBasicObject object, RubyBinding bindi
                                 this));
             }
         }
+
+        @Specialization(guards = "!isRubyBinding(arguments[1])")
+        public Object eval(@SuppressWarnings("unused") RubyBasicObject source, RubyBasicObject badBinding) {
+            throw new RaiseException(
+                    getContext().getCoreLibrary().typeError(
+                            String.format("wrong argument type %s (expected binding)",
+                                    badBinding.getLogicalClass().getName()),
+                            this));
+        }
     }
 
     @CoreMethod(names = "exec", isModuleFunction = true, required = 1, argumentsAsArray = true)

diff --git a/spec/truffle/tags/core/kernel/eval_tags.txt b/spec/truffle/tags/core/kernel/eval_tags.txt
@@ -1,6 +1,5 @@
 fails:Kernel#eval evaluates within the scope of the eval
 fails:Kernel#eval evaluates such that consts are scoped to the class of the eval
-fails:Kernel#eval doesn't accept a Proc object as a binding
 fails:Kernel#eval allows a binding to be captured inside an eval
 fails:Kernel#eval uses the same scope for local variables when given the same binding
 fails:Kernel#eval includes file and line information in syntax error

diff --git a/spec/truffle/tags/language/BEGIN_tags.txt b/spec/truffle/tags/language/BEGIN_tags.txt