jruby · Oct 6, 2014 · Oct 6, 2014
Showing with 56 additions and 38 deletions.

+56 −0 core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java

+0 −35 core/src/main/java/org/jruby/truffle/nodes/core/ObjectNodes.java

+0 −3 spec/truffle/tags/core/basicobject/__id__tags.txt
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
@@ -17,6 +17,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.jruby.truffle.nodes.dispatch.Dispatch;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
+import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;
 import org.jruby.truffle.runtime.*;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.*;
@@ -78,6 +79,26 @@ public boolean equal(Object a, Object b) {
 
     }
 
+    @CoreMethod(names = "__id__", needsSelf = true, maxArgs = 0)
+    public abstract static class IDNode extends CoreMethodNode {
+
+        public IDNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public IDNode(IDNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public long id(RubyBasicObject object) {
+            notDesignedForCompilation();
+
+            return object.getObjectID();
+        }
+
+    }
+
     @CoreMethod(names = "equal?", minArgs = 1, maxArgs = 1)
     public abstract static class ReferenceEqualNode extends CoreMethodNode {
 
@@ -143,6 +164,41 @@ public NilPlaceholder initiailze() {
 
     }
 
+    @CoreMethod(names = "instance_eval", needsBlock = true, maxArgs = 0)
+    public abstract static class InstanceEvalNode extends CoreMethodNode {
+
+        @Child protected YieldDispatchHeadNode yield;
+
+        public InstanceEvalNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+            yield = new YieldDispatchHeadNode(context);
+        }
+
+        public InstanceEvalNode(InstanceEvalNode prev) {
+            super(prev);
+            yield = prev.yield;
+        }
+
+        @Specialization
+        public Object instanceEval(VirtualFrame frame, RubyBasicObject receiver, RubyProc block) {
+            notDesignedForCompilation();
+
+            if (receiver instanceof RubyFixnum || receiver instanceof RubySymbol) {
+                throw new RaiseException(getContext().getCoreLibrary().typeError("no class to make alias", this));
+            }
+
+            return yield.dispatchWithModifiedSelf(frame, block, receiver);
+        }
+
+        @Specialization
+        public Object instanceEval(VirtualFrame frame, Object self, RubyProc block) {
+            notDesignedForCompilation();
+
+            return instanceEval(frame, getContext().getCoreLibrary().box(self), block);
+        }
+
+    }
+
     @CoreMethod(names = "method_missing", needsBlock = true, isSplatted = true)
     public abstract static class MethodMissingNode extends CoreMethodNode {
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ObjectNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ObjectNodes.java
@@ -492,41 +492,6 @@ public Object initializeDup(VirtualFrame frame, RubyObject self, RubyObject othe
 
     }
 
-    @CoreMethod(names = "instance_eval", needsBlock = true, maxArgs = 0)
-    public abstract static class InstanceEvalNode extends CoreMethodNode {
-
-        @Child protected YieldDispatchHeadNode yield;
-
-        public InstanceEvalNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-            yield = new YieldDispatchHeadNode(context);
-        }
-
-        public InstanceEvalNode(InstanceEvalNode prev) {
-            super(prev);
-            yield = prev.yield;
-        }
-
-        @Specialization
-        public Object instanceEval(VirtualFrame frame, RubyBasicObject receiver, RubyProc block) {
-            notDesignedForCompilation();
-
-            if (receiver instanceof RubyFixnum || receiver instanceof RubySymbol) {
-                throw new RaiseException(getContext().getCoreLibrary().typeError("no class to make alias", this));
-            }
-
-            return yield.dispatchWithModifiedSelf(frame, block, receiver);
-        }
-
-        @Specialization
-        public Object instanceEval(VirtualFrame frame, Object self, RubyProc block) {
-            notDesignedForCompilation();
-
-            return instanceEval(frame, getContext().getCoreLibrary().box(self), block);
-        }
-
-    }
-
     @CoreMethod(names = "instance_variable_defined?", minArgs = 1, maxArgs = 1)
     public abstract static class InstanceVariableDefinedNode extends CoreMethodNode {
 

diff --git a/spec/truffle/tags/core/basicobject/__id__tags.txt b/spec/truffle/tags/core/basicobject/__id__tags.txt