[Truffle] Use an execute method to not break encapsulation in #to_int…

… coercion.
jruby · Apr 17, 2015 · 760d8c5 · 760d8c5
1 parent bdb27a1
commit 760d8c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
@@ -55,13 +55,12 @@ public RubyBignum coerceRubyBignum(RubyBignum value) {
     }
 
     @Specialization
-    public Object coerceDouble(double value) {
+    public Object coerceDouble(VirtualFrame frame, double value) {
         if (floatToIntNode == null) {
             CompilerDirectives.transferToInterpreter();
             floatToIntNode = insert(FloatNodesFactory.ToINodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{}));
         }
-
-        return floatToIntNode.toI(value);
+        return floatToIntNode.executeToI(frame, value);
     }
 
     @Specialization(guards = "!isRubyBignum")
@@ -92,9 +91,7 @@ public Object coerceObject(VirtualFrame frame, Object object) {
             return coerced;
         } else {
             CompilerDirectives.transferToInterpreter();
-
-            throw new RaiseException(
-                    getContext().getCoreLibrary().typeErrorBadCoercion(object, "Integer", "to_int", coerced, this));
+            throw new RaiseException(getContext().getCoreLibrary().typeErrorBadCoercion(object, "Integer", "to_int", coerced, this));
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
@@ -779,8 +779,10 @@ public ToINode(ToINode prev) {
             fixnumOrBignum = prev.fixnumOrBignum;
         }
 
+        public abstract Object executeToI(VirtualFrame frame, double value);
+
         @Specialization
-        public Object toI(double value) {
+        Object toI(double value) {
             if (Double.isInfinite(value)) {
                 CompilerDirectives.transferToInterpreter();
                 throw new RaiseException(getContext().getCoreLibrary().floatDomainError("Infinity", this));