Move MatchArgFastPath to the fastpath Java package

Author: steve-s

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java

@@ -46,6 +46,8 @@
 import com.oracle.truffle.r.nodes.builtin.base.fastpaths.GetFastPathNodeGen;
 import com.oracle.truffle.r.nodes.builtin.base.fastpaths.IntersectFastPathNodeGen;
 import com.oracle.truffle.r.nodes.builtin.base.fastpaths.IsElementFastPathNodeGen;
+import com.oracle.truffle.r.nodes.builtin.base.fastpaths.MatchArgFastPath;
+import com.oracle.truffle.r.nodes.builtin.base.fastpaths.MatchArgFastPathNodeGen;
 import com.oracle.truffle.r.nodes.builtin.base.fastpaths.MatrixFastPathNodeGen;
 import com.oracle.truffle.r.nodes.builtin.base.fastpaths.SetDiffFastPathNodeGen;
 import com.oracle.truffle.r.nodes.builtin.base.fastpaths.StopifnotFastPath;

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Identical.java

@@ -78,7 +78,7 @@
 @RBuiltin(name = "identical", kind = INTERNAL, parameterNames = {"x", "y", "num.eq", "single.NA", "attrib.as.set", "ignore.bytecode", "ignore.environment", "ignore.srcref"}, behavior = PURE)
 public abstract class Identical extends RBuiltinNode.Arg8 {
 
-    protected abstract byte executeByte(Object x, Object y, boolean numEq, boolean singleNA, boolean attribAsSet, boolean ignoreBytecode, boolean ignoreEnvironment, boolean ignoreSrcref);
+    public abstract byte executeByte(Object x, Object y, boolean numEq, boolean singleNA, boolean attribAsSet, boolean ignoreBytecode, boolean ignoreEnvironment, boolean ignoreSrcref);
 
     @Child private Identical identicalRecursive;
     @Child private Identical identicalRecursiveAttr;

…nodes/builtin/base/MatchArgFastPath.java …tin/base/fastpaths/MatchArgFastPath.javacom.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/MatchArgFastPath.java renamed to com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/MatchArgFastPath.java com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/MatchArgFastPath.java renamed to com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/MatchArgFastPath.java

@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.truffle.r.nodes.builtin.base;
+package com.oracle.truffle.r.nodes.builtin.base.fastpaths;
 
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.logicalValue;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.stringValue;
@@ -44,7 +44,12 @@
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.typeName;
 
 import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNamesAttributeNode;
-import com.oracle.truffle.r.nodes.builtin.base.MatchArgFastPathNodeGen.MatchArgInternalNodeGen;
+import com.oracle.truffle.r.nodes.builtin.base.AsCharacter;
+import com.oracle.truffle.r.nodes.builtin.base.AsCharacterNodeGen;
+import com.oracle.truffle.r.nodes.builtin.base.Identical;
+import com.oracle.truffle.r.nodes.builtin.base.IdenticalNodeGen;
+import com.oracle.truffle.r.nodes.builtin.base.PMatch;
+import com.oracle.truffle.r.nodes.builtin.base.PMatchNodeGen;
 import com.oracle.truffle.r.nodes.function.ClassHierarchyNode;
 import com.oracle.truffle.r.nodes.function.ClassHierarchyNodeGen;
 import com.oracle.truffle.r.nodes.function.FormalArguments;
@@ -288,7 +293,7 @@ public Object execute(VirtualFrame frame) {
     }
 
     protected static MatchArgInternal createInternal() {
-        return MatchArgInternalNodeGen.create();
+        return MatchArgFastPathNodeGen.MatchArgInternalNodeGen.create();
     }
 
     @Specialization(limit = "1", guards = "cache.choicesValue.isSupported(frame, arg)")
@@ -304,7 +309,7 @@ public static final class MatchArgNode extends Node {
 
         public MatchArgNode(VirtualFrame frame, RPromise arg) {
             this.choicesValue = new MatchArgChoices(frame, arg);
-            this.internal = MatchArgInternalNodeGen.create();
+            this.internal = MatchArgFastPathNodeGen.MatchArgInternalNodeGen.create();
             this.promiseHelper = new PromiseHelperNode();
         }
     }