[truffle] Rename and move nodes

Raku · Jun 24, 2018 · 066e699 · 066e699
1 parent 599bfb2
commit 066e699
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/TruffleCompiler.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/TruffleCompiler.java
@@ -12,6 +12,12 @@
 import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
 import org.perl6.nqp.truffle.nodes.NQPBlockBodyNode;
 import org.perl6.nqp.truffle.nodes.NQPNotClosureNode;
+
+import org.perl6.nqp.truffle.nodes.expression.NQPSValNode;
+
+import org.perl6.nqp.truffle.nodes.io.NQPSayNode;
+import org.perl6.nqp.truffle.nodes.io.NQPPrintNode;
+
 import org.perl6.nqp.truffle.nodes.call.NQPInvokeNode;
 import org.perl6.nqp.truffle.nodes.variables.NQPReadLocalVariableNodeGen;
 import org.perl6.nqp.truffle.nodes.variables.NQPBindLocalVariableNodeGen;
@@ -54,7 +60,7 @@ public NQPExpressionNode build(SixModelObject node, NQPScope scope, ThreadContex
                 return new NQPStmts(children);
             }
             case "sval":
-                return new NQPSVal(node.at_pos_boxed(tc, 1).get_str(tc));
+                return new NQPSValNode(node.at_pos_boxed(tc, 1).get_str(tc));
             case "call":
                 NQPExpressionNode codeRef = build(node.at_pos_boxed(tc, 1), scope, tc);
                 NQPExpressionNode args[] = expressions(node, 2, scope, tc);

diff --git a/...untime/org/perl6/nqp/truffle/NQPSVal.java → ...truffle/nodes/expression/NQPSValNode.java b/...untime/org/perl6/nqp/truffle/NQPSVal.java → ...truffle/nodes/expression/NQPSValNode.java
@@ -39,16 +39,16 @@
  * SOFTWARE.
  */
 
-package org.perl6.nqp.truffle;
+package org.perl6.nqp.truffle.nodes.expression;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
 
 @NodeInfo(shortName = "const")
-public final class NQPSVal extends NQPExpressionNode {
+public final class NQPSValNode extends NQPExpressionNode {
     private final String value;
 
-    public NQPSVal(String value) {
+    public NQPSValNode(String value) {
         this.value = value;
     }
 

diff --git a/...e/org/perl6/nqp/truffle/NQPPrintNode.java → ...l6/nqp/truffle/nodes/io/NQPPrintNode.java b/...e/org/perl6/nqp/truffle/NQPPrintNode.java → ...l6/nqp/truffle/nodes/io/NQPPrintNode.java
@@ -1,4 +1,4 @@
-package org.perl6.nqp.truffle;
+package org.perl6.nqp.truffle.nodes.io;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.dsl.NodeChildren;
@@ -9,7 +9,7 @@
 public class NQPPrintNode extends NQPExpressionNode {
     @Child private NQPExpressionNode arg;
 
-    NQPPrintNode(NQPExpressionNode arg) {
+    public NQPPrintNode(NQPExpressionNode arg) {
       this.arg = arg;
     }
 

diff --git a/...ime/org/perl6/nqp/truffle/NQPSayNode.java → ...erl6/nqp/truffle/nodes/io/NQPSayNode.java b/...ime/org/perl6/nqp/truffle/NQPSayNode.java → ...erl6/nqp/truffle/nodes/io/NQPSayNode.java
@@ -1,4 +1,4 @@
-package org.perl6.nqp.truffle;
+package org.perl6.nqp.truffle.nodes.io;
 
 import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -9,7 +9,7 @@
 public class NQPSayNode extends NQPExpressionNode {
     @Child private NQPExpressionNode arg;
 
-    NQPSayNode(NQPExpressionNode arg) {
+    public NQPSayNode(NQPExpressionNode arg) {
       this.arg = arg;
     }