[Truffle] Implemented Kernel#eval with a String-coerced argument.

jruby · Dec 5, 2014 · 3c98a0f · 3c98a0f
1 parent aaed4a6
commit 3c98a0f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -266,6 +266,10 @@ public static boolean isSecondFloat(Object a, Object b) {
         return b instanceof Double;
     }
 
+    public static boolean isString(Object o) {
+        return o instanceof RubyString;
+    }
+
     public RubyBignum bignum(int value) {
         return bignum((long) value);
     }

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
@@ -479,12 +479,16 @@ public EqlNode(EqlNode prev) {
     @CoreMethod(names = "eval", isModuleFunction = true, required = 1, optional = 1)
     public abstract static class EvalNode extends CoreMethodNode {
 
+        @Child protected DispatchHeadNode toStr;
+
         public EvalNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            toStr = new DispatchHeadNode(context);
         }
 
         public EvalNode(EvalNode prev) {
             super(prev);
+            toStr = prev.toStr;
         }
 
         @Specialization
@@ -501,6 +505,14 @@ public Object eval(RubyString source, RubyBinding binding) {
             return getContext().eval(source.toString(), binding, this);
         }
 
+        @Specialization(guards = "!isString")
+        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);
+        }
     }
 
     @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,7 +1,7 @@
 fails:Kernel#eval is a private method
 fails:Kernel#eval is a module function
 fails:Kernel#eval evaluates the code within
-fails:Kernel#eval coerces an object to string
+passes:Kernel#eval coerces an object to string
 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 finds a local in an enclosing scope