[truffle] Cleanup node construction, get rid of unneded method

Author: pmurias

src/vm/jvm/dsl/org/perl6/nqp/dsl/Processor.java

@@ -109,9 +109,9 @@ private void writeParams(ExecutableElement executableElement, AstTypes astTypes,
             }
 
             if (paramType.equals(astTypes.nodeClass)) {
-                writer.append("build(node.at_pos_boxed(tc, " + (i+1) + "), scope, tc)");
+                writer.append("tastToNode(node.at_pos_boxed(tc, " + (i+1) + "), scope, tc)");
             } else if (paramType.equals(astTypes.nodesClass)) {
-                writer.append("expressions(node, " + (i+1) + ", scope, tc)");
+                writer.append("tastToNodeArray(node, " + (i+1) + ", scope, tc)");
             } else if (paramType.equals(astTypes.intClass)) {
                 writer.append("node.at_pos_boxed(tc, " + (i+1) + ").get_int(tc)");
             } else if (paramType.equals(astTypes.numClass)) {
@@ -139,7 +139,7 @@ private String getElementCall(ExecutableElement element) {
     }
 
     private void writeBuildMethod(AstTypes astTypes, PrintWriter writer, RoundEnvironment roundEnv) {
-        writer.append("    public NQPNode buildSimple(SixModelObject node, NQPScope scope, ThreadContext tc) {\n");
+        writer.append("    public NQPNode tastToNode(SixModelObject node, NQPScope scope, ThreadContext tc) {\n");
 
         writer.append("        switch (node.at_pos_boxed(tc, 0).get_str(tc)) {\n");
 
@@ -179,7 +179,7 @@ private void writeBuildMethod(AstTypes astTypes, PrintWriter writer, RoundEnviro
             writer.append(");\n");
         }
 
-        writer.append("            default: return null;\n");
+        writer.append("            default: throw new IllegalArgumentException(\"Wrong node type: \" + node.at_pos_boxed(tc, 0).get_str(tc));\n");
 
         writer.append("        }\n");
 

src/vm/jvm/runtime/org/perl6/nqp/truffle/TruffleCompiler.java

@@ -37,33 +37,23 @@
 abstract class TruffleCompiler {
     public void run(SixModelObject node, ThreadContext tc) {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
-        RootNode rootNode = new NQPRootNode(null, frameDescriptor, build(node, new NQPScopeWithFrame(frameDescriptor, null), tc));
+        RootNode rootNode = new NQPRootNode(null, frameDescriptor, tastToNode(node, new NQPScopeWithFrame(frameDescriptor, null), tc));
 
 
         CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
         callTarget.call();
     }
 
-    protected NQPNode[] expressions(SixModelObject node, int from, NQPScope scope, ThreadContext tc) {
+    protected NQPNode[] tastToNodeArray(SixModelObject node, int from, NQPScope scope, ThreadContext tc) {
         int elems = (int) node.elems(tc);
         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);
+           children[i-from] =  tastToNode(node.at_pos_boxed(tc, i), scope, tc);
         }
         return children;
     }
 
-    abstract protected NQPNode buildSimple(SixModelObject node, NQPScope scope, ThreadContext tc);
-
-    public NQPNode build(SixModelObject node, NQPScope scope, ThreadContext tc) {
-        NQPNode trySimple = buildSimple(node, scope, tc);
-        if (trySimple != null) return trySimple;
-
-        switch (node.at_pos_boxed(tc, 0).get_str(tc)) {
-            default:
-                throw new IllegalArgumentException("Wrong node type: " + node.at_pos_boxed(tc, 0).get_str(tc));
-        }
-    }
+    abstract protected NQPNode tastToNode(SixModelObject node, NQPScope scope, ThreadContext tc);
 
     @Predeserializer("block")
     public static NQPScope createNewScope(NQPScope scope) {