jruby · Apr 30, 2015 · Apr 30, 2015
Showing with 14 additions and 28 deletions.

+14 −28 truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -43,10 +43,14 @@ public RubyNode(RubyContext context, SourceSection sourceSection) {
         this.context = context;
     }
 
-    // Fundamental execute method
+    // Fundamental execute methods
 
     public abstract Object execute(VirtualFrame frame);
 
+    public Object isDefined(VirtualFrame frame) {
+        return getContext().makeString("expression");
+    }
+
     // Execute without returing the result
 
     public void executeVoid(VirtualFrame frame) {
@@ -217,24 +221,10 @@ public Object[] executeObjectArray(VirtualFrame frame) throws UnexpectedResultEx
 
     // Guards which use the context and so can't be static
 
-    public boolean isRubyNilObject(Object value) {
-        return value == nil();
-    }
-
     public boolean isRubiniusUndefined(Object value) {
         return value == getContext().getCoreLibrary().getRubiniusUndefined();
     }
 
-    public boolean isRational(RubyBasicObject o) {
-        // TODO(CS, 10-Jan-15) should this be a full is_a? test? We'd need a node for that.
-        return o.getLogicalClass() == getContext().getCoreLibrary().getRationalClass();
-    }
-
-    public boolean isComplex(RubyBasicObject o) {
-        // TODO(BF, 4-4-15) COPIED from isRational - should this be a full is_a? test? We'd need a node for that.
-        return o.getLogicalClass() == getContext().getCoreLibrary().getComplexClass();
-    }
-
     // Helpers methods for terseness
 
     protected RubyNilClass nil() {
@@ -257,10 +247,6 @@ public ProbeNode.WrapperNode createWrapperNode() {
         return new RubyWrapperNode(this);
     }
 
-    public RubyNode getNonWrapperNode() {
-        return this;
-    }
-
     public void setAtNewline() {
         atNewline = true;
     }
@@ -273,23 +259,22 @@ public RubyNode getNonProxyNode() {
         return this;
     }
 
-    /**
-     * Ruby's parallel semantic path.
-     * 
-     * @see DefinedNode
-     */
-    public Object isDefined(VirtualFrame frame) {
-        return getContext().makeString("expression");
-    }
+    // Accessors
 
     public RubyContext getContext() {
         return context;
     }
 
+    // notDesignedForCompilation() helper
+
+    // TODO CS 30-Apr-15 inline this when we think it's working well
+
     public static void notDesignedForCompilation() {
-        CompilerDirectives.bailout("this code either doesn't implement Ruby semantics properly, or is a basic implementation that will not compile");
+        CompilerDirectives.transferToInterpreter();
     }
 
+    // ruby() helper
+
     protected Object ruby(VirtualFrame frame, String expression, Object... arguments) {
         return rubyWithSelf(frame, RubyArguments.getSelf(frame.getArguments()), expression, arguments);
     }
@@ -320,4 +305,5 @@ private MaterializedFrame setupFrame(Object self, Object... arguments) {
 
         return evalFrame;
     }
+
 }