Move out primitive nodes from StringNodes into StringPrimitiveNodes

Author: andrykonchin

src/main/java/org/truffleruby/builtins/BuiltinsClasses.java

@@ -26,6 +26,8 @@
 import org.truffleruby.core.TruffleSystemNodesFactory;
 import org.truffleruby.core.VMPrimitiveNodesBuiltins;
 import org.truffleruby.core.VMPrimitiveNodesFactory;
+import org.truffleruby.core.string.StringPrimitiveNodesBuiltins;
+import org.truffleruby.core.string.StringPrimitiveNodesFactory;
 import org.truffleruby.core.array.ArrayIndexNodesBuiltins;
 import org.truffleruby.core.array.ArrayIndexNodesFactory;
 import org.truffleruby.core.array.ArrayNodesBuiltins;
@@ -256,6 +258,7 @@ public static void setupBuiltinsLazy(CoreMethodNodeManager coreManager) {
         TypeNodesBuiltins.setup(coreManager);
         UnboundMethodNodesBuiltins.setup(coreManager);
         VMPrimitiveNodesBuiltins.setup(coreManager);
+        StringPrimitiveNodesBuiltins.setup(coreManager);
         WeakKeyMapNodesBuiltins.setup(coreManager);
         WeakMapNodesBuiltins.setup(coreManager);
         WeakRefNodesBuiltins.setup(coreManager);
@@ -339,6 +342,7 @@ public static void setupBuiltinsLazyPrimitives(PrimitiveManager primitiveManager
         TypeNodesBuiltins.setupPrimitives(primitiveManager);
         UnboundMethodNodesBuiltins.setupPrimitives(primitiveManager);
         VMPrimitiveNodesBuiltins.setupPrimitives(primitiveManager);
+        StringPrimitiveNodesBuiltins.setupPrimitives(primitiveManager);
         WeakKeyMapNodesBuiltins.setupPrimitives(primitiveManager);
         WeakMapNodesBuiltins.setupPrimitives(primitiveManager);
         WeakRefNodesBuiltins.setupPrimitives(primitiveManager);
@@ -423,6 +427,7 @@ public static List<List<? extends NodeFactory<? extends RubyBaseNode>>> getCoreN
                 TypeNodesFactory.getFactories(),
                 UnboundMethodNodesFactory.getFactories(),
                 VMPrimitiveNodesFactory.getFactories(),
+                StringPrimitiveNodesFactory.getFactories(),
                 WeakKeyMapNodesFactory.getFactories(),
                 WeakMapNodesFactory.getFactories(),
                 WeakRefNodesFactory.getFactories());

src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java

@@ -69,7 +69,7 @@
 import org.truffleruby.core.string.TStringBuilder;
 import org.truffleruby.core.string.TStringWithEncoding;
 import org.truffleruby.core.string.RubyString;
-import org.truffleruby.core.string.StringNodes.StringAppendPrimitiveNode;
+import org.truffleruby.core.string.StringPrimitiveNodes.StringAppendPrimitiveNode;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.interop.InteropNodes;

src/main/java/org/truffleruby/core/string/InterpolatedStringNode.java

@@ -24,7 +24,7 @@ public final class InterpolatedStringNode extends RubyContextSourceNode {
 
     @Children private final ToSNode[] children;
 
-    @Child private StringNodes.StringAppendPrimitiveNode appendNode;
+    @Child private StringPrimitiveNodes.StringAppendPrimitiveNode appendNode;
 
     private final RubyEncoding encoding;
     private final TruffleString emptyTString;
@@ -56,7 +56,7 @@ public Object execute(VirtualFrame frame) {
     private RubyString executeStringAppend(RubyString builder, Object string) {
         if (appendNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            appendNode = insert(StringNodesFactory.StringAppendPrimitiveNodeFactory.create(null));
+            appendNode = insert(StringPrimitiveNodesFactory.StringAppendPrimitiveNodeFactory.create(null));
         }
         return appendNode.executeStringAppend(builder, string);
     }