jruby · Mar 22, 2016 · Mar 22, 2016 · Mar 22, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/AbstractExecuteMethodNode.java b/truffle/src/main/java/org/jruby/truffle/interop/AbstractExecuteMethodNode.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.interop;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.RubyContext;
+import org.jruby.truffle.language.RubyNode;
+
+public abstract class AbstractExecuteMethodNode extends RubyNode {
+    public AbstractExecuteMethodNode(RubyContext context,
+                                     SourceSection sourceSection) {
+        super(context, sourceSection);
+    }
+
+    public abstract Object executeWithTarget(VirtualFrame frame, Object method);
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ExecuteMethodNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ExecuteMethodNode.java
@@ -30,7 +30,7 @@
 import java.util.List;
 
 @NodeChild(value="method", type = RubyNode.class)
-public abstract class ExecuteMethodNode extends RubyNode {
+public abstract class ExecuteMethodNode extends AbstractExecuteMethodNode {
     @Child private IndirectCallNode callNode;
     public ExecuteMethodNode(RubyContext context,
                              SourceSection sourceSection) {
@@ -74,6 +74,10 @@ protected Object doCall(VirtualFrame frame, DynamicObject method) {
         return callNode.call(frame, internalMethod.getCallTarget(), RubyArguments.pack(null, null, internalMethod, DeclarationContext.METHOD, null, Layouts.METHOD.getReceiver(method), null, args));
     }
 
+    protected InternalMethod getMethodFromProc(DynamicObject proc) {
+        return Layouts.PROC.getMethod(proc);
+    }
+
     protected CallTarget getCallTarget(DynamicObject proc) {
         return Layouts.PROC.getCallTargetForType(proc);
     }
@@ -82,5 +86,4 @@ protected InternalMethod getMethod(DynamicObject method) {
         return Layouts.METHOD.getMethod(method);
     }
 
-    public abstract Object executeWithTarget(VirtualFrame frame, Object method);
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignGetSizeNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignGetSizeNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignInvokeNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignInvokeNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignIsNullNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignIsNullNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignUnboxNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignUnboxNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignWriteNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignWriteNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropArgumentNode.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.interop;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.ForeignAccess;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.RubyContext;
+import org.jruby.truffle.language.RubyNode;
+
+public class InteropArgumentNode extends RubyNode {
+    private final int index;
+
+    public InteropArgumentNode(RubyContext context, SourceSection sourceSection, int index) {
+        super(context, sourceSection);
+        this.index = index;
+    }
+
+    public Object execute(VirtualFrame frame) {
+        return ForeignAccess.getArguments(frame).get(index);
+    }
+
+}