[Truffle] Re-use Module#Include implementation for main.include.

jruby · Oct 3, 2014 · cf817d7 · chrisseaton · Oct 3, 2014 · chrisseaton
1 parent 7d97cfc
commit cf817d7
Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/MainNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/MainNodes.java
@@ -12,22 +12,22 @@
 import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.api.dsl.*;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.runtime.*;
 import org.jruby.truffle.runtime.core.*;
 
 @CoreClass(name = "main")
 public abstract class MainNodes {
 
-    @CoreMethod(names = "include", isSplatted = true, minArgs = 1)
+    @CoreMethod(names = "include", isSplatted = true, needsSelf = false, minArgs = 1)
     public abstract static class IncludeNode extends CoreMethodNode {
 
-        @Child protected DispatchHeadNode includeNode;
+        @Child protected ModuleNodes.IncludeNode includeNode;
 
         public IncludeNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            includeNode = new DispatchHeadNode(context);
-
+            includeNode = ModuleNodesFactory.IncludeNodeFactory.create(context, sourceSection, new RubyNode[]{null, null});
         }
 
         public IncludeNode(IncludeNode prev) {
@@ -38,11 +38,8 @@ public IncludeNode(IncludeNode prev) {
         @Specialization
         public NilPlaceholder include(VirtualFrame frame, Object[] args) {
             notDesignedForCompilation();
-
-            RubyClass object = getContext().getCoreLibrary().getObjectClass();
-
-            // TODO: MRI does this call statically
-            return (NilPlaceholder) includeNode.call(frame, object, "include", null, args);
+            final RubyClass object = getContext().getCoreLibrary().getObjectClass();
+            return includeNode.executeInclude(frame, object, args);
         }
     }
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -654,6 +654,8 @@ public IncludeNode(IncludeNode prev) {
             appendFeaturesNode = prev.appendFeaturesNode;
         }
 
+        public abstract NilPlaceholder executeInclude(VirtualFrame frame, RubyModule module, Object[] args);
+
         @Specialization
         public NilPlaceholder include(VirtualFrame frame, RubyModule module, Object[] args) {
             notDesignedForCompilation();

diff --git a/spec/truffle/tags/language/constants_tags.txt b/spec/truffle/tags/language/constants_tags.txt
@@ -31,3 +31,6 @@ fails:Constant resolution within methods with dynamically assigned constants doe
 fails:Module#public_constant marked constants in a module is defined? with A::B form
 fails:Module#public_constant marked constants in a class is defined? with A::B form
 fails:Literal (A::X) constant resolution with statically assigned constants searches Object if a toplevel qualifier (::X) is given
+fails:Literal (A::X) constant resolution with statically assigned constants searches a module included in the superclass
+fails:Constant resolution within methods with statically assigned constants searches a module included in the superclass
+fails:Constant resolution within methods with statically assigned constants searches Object as a lexical scope only if Object is explicitly opened