[truffle] Rename stuff to use shorter names like other truffle langua…

…ges do Rename NQPExpressionNode -> NQPNode. Rename NQPNode.executeGeneric -> NQPNode.execute.
Raku · Jun 26, 2018 · 9538d9b · 9538d9b
1 parent bddb5c8
commit 9538d9b
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 70 deletions.
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPRootNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPRootNode.java
@@ -45,19 +45,19 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.NQPLanguage;
 
 @NodeInfo(language = "NQP", description = "The root of all NQP execution trees")
 public class NQPRootNode extends RootNode {
     /** The function body that is executed, and specialized during execution. */
-    @Child private NQPExpressionNode bodyNode;
-    public NQPRootNode(NQPLanguage language, FrameDescriptor frameDescriptor, NQPExpressionNode bodyNode) {
+    @Child private NQPNode bodyNode;
+    public NQPRootNode(NQPLanguage language, FrameDescriptor frameDescriptor, NQPNode bodyNode) {
         super(language, frameDescriptor);
         this.bodyNode = bodyNode;
     }
 
-    public NQPRootNode(NQPLanguage language, NQPExpressionNode bodyNode) {
+    public NQPRootNode(NQPLanguage language, NQPNode bodyNode) {
         super(language);
         this.bodyNode = bodyNode;
     }

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPStmts.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPStmts.java
@@ -49,13 +49,13 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 @NodeInfo(shortName = "stmts", description = "The node implementing a QAST::Stmts")
-public final class NQPStmts extends NQPExpressionNode {
-    @Children private final NQPExpressionNode[] bodyNodes;
+public final class NQPStmts extends NQPNode {
+    @Children private final NQPNode[] bodyNodes;
 
-    public NQPStmts(NQPExpressionNode[] bodyNodes) {
+    public NQPStmts(NQPNode[] bodyNodes) {
         this.bodyNodes = bodyNodes;
     }
 
@@ -70,7 +70,7 @@ public Object executeGeneric(VirtualFrame frame) {
 
         CompilerAsserts.compilationConstant(bodyNodes.length);
 
-        for (NQPExpressionNode statement : bodyNodes) {
+        for (NQPNode statement : bodyNodes) {
             ret = statement.executeGeneric(frame);
         }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/TruffleCompiler.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/TruffleCompiler.java
@@ -9,7 +9,7 @@
 import org.perl6.nqp.runtime.ThreadContext;
 import org.perl6.nqp.sixmodel.SixModelObject;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.nodes.NQPBlockBodyNode;
 import org.perl6.nqp.truffle.nodes.NQPNotClosureNode;
 
@@ -44,27 +44,27 @@ public static void run(SixModelObject node, ThreadContext tc) {
         callTarget.call();
     }
 
-    private NQPExpressionNode[] expressions(SixModelObject node, NQPScope scope, ThreadContext tc) {
+    private NQPNode[] expressions(SixModelObject node, NQPScope scope, ThreadContext tc) {
         return expressions(node, 1, scope, tc);
     }
 
-    private NQPExpressionNode[] expressions(SixModelObject node, int from, NQPScope scope, ThreadContext tc) {
+    private NQPNode[] expressions(SixModelObject node, int from, NQPScope scope, ThreadContext tc) {
         int elems = (int) node.elems(tc);
-        NQPExpressionNode children[] = new NQPExpressionNode[elems - from];
+        NQPNode children[] = new NQPNode[elems - from];
         for (int i = from; i < elems; i++) {
            children[i-from] =  build(node.at_pos_boxed(tc, i), scope, tc);
         }
         return children;
     }
 
-    public NQPExpressionNode build(SixModelObject node, NQPScope scope, ThreadContext tc) {
+    public NQPNode build(SixModelObject node, NQPScope scope, ThreadContext tc) {
         switch (node.at_pos_boxed(tc, 0).get_str(tc)) {
             case "say":
                 return new NQPSayNode(build(node.at_pos_boxed(tc, 1), scope, tc));
             case "print":
                 return new NQPPrintNode(build(node.at_pos_boxed(tc, 1), scope, tc));
             case "stmts": {
-                NQPExpressionNode children[] = expressions(node, scope, tc);
+                NQPNode children[] = expressions(node, scope, tc);
                 return new NQPStmts(children);
             }
             case "ival":
@@ -82,8 +82,8 @@ public NQPExpressionNode build(SixModelObject node, NQPScope scope, ThreadContex
             case "str-arg":
                 return new NQPStrArgNode(build(node.at_pos_boxed(tc, 1), scope, tc));
             case "call":
-                NQPExpressionNode codeRef = build(node.at_pos_boxed(tc, 1), scope, tc);
-                NQPExpressionNode args[] = expressions(node, 2, scope, tc);
+                NQPNode codeRef = build(node.at_pos_boxed(tc, 1), scope, tc);
+                NQPNode args[] = expressions(node, 2, scope, tc);
                 return new NQPInvokeNode(codeRef, args);
             case "declare-lexical":
                 scope.addLexical(node.at_pos_boxed(tc, 1).get_str(tc));
@@ -94,7 +94,7 @@ public NQPExpressionNode build(SixModelObject node, NQPScope scope, ThreadContex
             }
             case "bind-lexical": {
                 FrameSlot frameSlot = scope.findLexical(node.at_pos_boxed(tc, 1).get_str(tc));
-                NQPExpressionNode valueNode = build(node.at_pos_boxed(tc, 2), scope, tc);
+                NQPNode valueNode = build(node.at_pos_boxed(tc, 2), scope, tc);
                 return new NQPBindLocalVariableNode(frameSlot, valueNode);
             }
             case "get-lexical-positional": {
@@ -105,7 +105,7 @@ public NQPExpressionNode build(SixModelObject node, NQPScope scope, ThreadContex
             }
             case "block": {
                 FrameDescriptor frameDescriptor = new FrameDescriptor();
-                NQPExpressionNode children[] = expressions(node, new NQPScopeWithFrame(frameDescriptor), tc);
+                NQPNode children[] = expressions(node, new NQPScopeWithFrame(frameDescriptor), tc);
                 return new NQPNotClosureNode(new NQPCodeRef(
                     new NQPRootNode(null, frameDescriptor, new NQPBlockBodyNode(children))
                 ));

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/NQPBlockBodyNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/NQPBlockBodyNode.java
@@ -47,17 +47,17 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 import java.util.Map;
 
 @NodeInfo(shortName = "block body", description = "The node implementing the inside of a QAST::Block")
-public final class NQPBlockBodyNode extends NQPExpressionNode {
-    @Children private final NQPExpressionNode[] bodyNodes;
+public final class NQPBlockBodyNode extends NQPNode {
+    @Children private final NQPNode[] bodyNodes;
 
     private Map<String, FrameSlot> varSlots;
 
-    public NQPBlockBodyNode(NQPExpressionNode[] bodyNodes) {
+    public NQPBlockBodyNode(NQPNode[] bodyNodes) {
         this.bodyNodes = bodyNodes;
     }
 
@@ -76,7 +76,7 @@ public Object executeGeneric(VirtualFrame frame) {
 
         CompilerAsserts.compilationConstant(bodyNodes.length);
 
-        for (NQPExpressionNode statement : bodyNodes) {
+        for (NQPNode statement : bodyNodes) {
             ret = statement.executeGeneric(frame);
         }
 

diff --git a/.../nqp/truffle/nodes/NQPExpressionNode.java → .../org/perl6/nqp/truffle/nodes/NQPNode.java b/.../nqp/truffle/nodes/NQPExpressionNode.java → .../org/perl6/nqp/truffle/nodes/NQPNode.java
@@ -46,7 +46,7 @@
 import org.perl6.nqp.truffle.MalformedAstException;
 
 @TypeSystemReference(NQPTypes.class)
-public abstract class NQPExpressionNode extends NQPBaseNode {
+public abstract class NQPNode extends NQPBaseNode {
     public Object executeGeneric(VirtualFrame frame) {
         throw new MalformedAstException("Expected an AST node that produces an object");
     }

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/NQPNotClosureNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/NQPNotClosureNode.java
@@ -1,10 +1,10 @@
 package org.perl6.nqp.truffle.nodes;
 
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class NQPNotClosureNode extends NQPExpressionNode {
+public class NQPNotClosureNode extends NQPNode {
     private final NQPCodeRef codeRef;
 
     public NQPNotClosureNode(NQPCodeRef codeRef) {

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPIntArgNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPIntArgNode.java
@@ -44,15 +44,15 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 
 @NodeInfo(shortName = "int arg")
-public final class NQPIntArgNode extends NQPExpressionNode {
-    @Child private NQPExpressionNode valueNode;
+public final class NQPIntArgNode extends NQPNode {
+    @Child private NQPNode valueNode;
 
-    public NQPIntArgNode(NQPExpressionNode valueNode) {
+    public NQPIntArgNode(NQPNode valueNode) {
         this.valueNode = valueNode;
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPInvokeNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPInvokeNode.java
@@ -47,18 +47,18 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 
 @NodeInfo(shortName = "invoke")
-public final class NQPInvokeNode extends NQPExpressionNode {
+public final class NQPInvokeNode extends NQPNode {
 
-    @Child private NQPExpressionNode functionNode;
-    @Children private final NQPExpressionNode[] argumentNodes;
+    @Child private NQPNode functionNode;
+    @Children private final NQPNode[] argumentNodes;
     @Child private NQPDispatchNode dispatchNode;
 
-    public NQPInvokeNode(NQPExpressionNode functionNode, NQPExpressionNode[] argumentNodes) {
+    public NQPInvokeNode(NQPNode functionNode, NQPNode[] argumentNodes) {
         this.functionNode = functionNode;
         this.argumentNodes = argumentNodes;
         this.dispatchNode = NQPDispatchNodeGen.create();

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPNumArgNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPNumArgNode.java
@@ -44,15 +44,15 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 
 @NodeInfo(shortName = "num arg")
-public final class NQPNumArgNode extends NQPExpressionNode {
-    @Child private NQPExpressionNode valueNode;
+public final class NQPNumArgNode extends NQPNode {
+    @Child private NQPNode valueNode;
 
-    public NQPNumArgNode(NQPExpressionNode valueNode) {
+    public NQPNumArgNode(NQPNode valueNode) {
         this.valueNode = valueNode;
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPStrArgNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/call/NQPStrArgNode.java
@@ -44,15 +44,15 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 
 @NodeInfo(shortName = "str arg")
-public final class NQPStrArgNode extends NQPExpressionNode {
-    @Child private NQPExpressionNode valueNode;
+public final class NQPStrArgNode extends NQPNode {
+    @Child private NQPNode valueNode;
 
-    public NQPStrArgNode(NQPExpressionNode valueNode) {
+    public NQPStrArgNode(NQPNode valueNode) {
         this.valueNode = valueNode;
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPIValNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPIValNode.java
@@ -42,10 +42,10 @@
 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;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 @NodeInfo(shortName = "const")
-public final class NQPIValNode extends NQPExpressionNode {
+public final class NQPIValNode extends NQPNode {
     private final long value;
 
     public NQPIValNode(long value) {

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPNValNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPNValNode.java
@@ -42,10 +42,10 @@
 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;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 @NodeInfo(shortName = "const")
-public final class NQPNValNode extends NQPExpressionNode {
+public final class NQPNValNode extends NQPNode {
     private final double value;
 
     public NQPNValNode(double value) {

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSValNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSValNode.java
@@ -42,10 +42,10 @@
 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;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 @NodeInfo(shortName = "const")
-public final class NQPSValNode extends NQPExpressionNode {
+public final class NQPSValNode extends NQPNode {
     private final String value;
 
     public NQPSValNode(String value) {

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSmartStringifyNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSmartStringifyNode.java
@@ -44,15 +44,15 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 
 @NodeInfo(shortName = "smart stringify")
-public final class NQPSmartStringifyNode extends NQPExpressionNode {
-    @Child private NQPExpressionNode valueNode;
+public final class NQPSmartStringifyNode extends NQPNode {
+    @Child private NQPNode valueNode;
 
-    public NQPSmartStringifyNode(NQPExpressionNode valueNode) {
+    public NQPSmartStringifyNode(NQPNode valueNode) {
         this.valueNode = valueNode;
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/io/NQPPrintNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/io/NQPPrintNode.java
@@ -3,13 +3,13 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.NodeChild;
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 @NodeChildren({@NodeChild("arg")})
-public class NQPPrintNode extends NQPExpressionNode {
-    @Child private NQPExpressionNode arg;
+public class NQPPrintNode extends NQPNode {
+    @Child private NQPNode arg;
 
-    public NQPPrintNode(NQPExpressionNode arg) {
+    public NQPPrintNode(NQPNode arg) {
       this.arg = arg;
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/io/NQPSayNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/io/NQPSayNode.java
@@ -1,15 +1,15 @@
 package org.perl6.nqp.truffle.nodes.io;
 
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.NodeChild;
 
 @NodeChildren({@NodeChild("arg")})
-public class NQPSayNode extends NQPExpressionNode {
-    @Child private NQPExpressionNode arg;
+public class NQPSayNode extends NQPNode {
+    @Child private NQPNode arg;
 
-    public NQPSayNode(NQPExpressionNode arg) {
+    public NQPSayNode(NQPNode arg) {
       this.arg = arg;
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/variables/NQPBindLocalVariableNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/variables/NQPBindLocalVariableNode.java
@@ -47,14 +47,14 @@
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
 @NodeField(name = "slot", type = FrameSlot.class)
-public class NQPBindLocalVariableNode extends NQPExpressionNode {
+public class NQPBindLocalVariableNode extends NQPNode {
     final private FrameSlot slot;
-    @Child private NQPExpressionNode valueNode;
+    @Child private NQPNode valueNode;
 
-    public NQPBindLocalVariableNode(FrameSlot slot, NQPExpressionNode valueNode) {
+    public NQPBindLocalVariableNode(FrameSlot slot, NQPNode valueNode) {
         this.slot = slot;
         this.valueNode = valueNode;
     }

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/variables/NQPGetPositionalNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/variables/NQPGetPositionalNode.java
@@ -47,9 +47,9 @@
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 
-public class NQPGetPositionalNode extends NQPExpressionNode {
+public class NQPGetPositionalNode extends NQPNode {
     private final FrameSlot slot;
     private final int index;
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/variables/NQPReadLocalVariableNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/variables/NQPReadLocalVariableNode.java
@@ -49,10 +49,10 @@
 import com.oracle.truffle.api.frame.FrameUtil;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import org.perl6.nqp.truffle.nodes.NQPExpressionNode;
+import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.NQPTypes;
 
-public class NQPReadLocalVariableNode extends NQPExpressionNode {
+public class NQPReadLocalVariableNode extends NQPNode {
     private final FrameSlot slot;
 
     public NQPReadLocalVariableNode(FrameSlot slot) {