[truffle] Teach our DSL processor how to handle int, num, str arguments to nodes

Author: pmurias

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

@@ -10,4 +10,7 @@
 public @interface AstBuilder {
     Class nodeClass();
     Class nodesClass();
+    Class intClass();
+    Class numClass();
+    Class strClass();
 }

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

@@ -40,7 +40,7 @@ private String opNameFromClassName(String className) {
           .toLowerCase();
     }
 
-    private void writeBuildMethod(TypeMirror nodeClass, TypeMirror nodesClass, PrintWriter writer, RoundEnvironment roundEnv) {
+    private void writeBuildMethod(TypeMirror nodeClass, TypeMirror nodesClass, TypeMirror intClass, TypeMirror numClass, TypeMirror strClass, PrintWriter writer, RoundEnvironment roundEnv) {
         writer.append("    public NQPNode buildSimple(SixModelObject node, NQPScope scope, ThreadContext tc) {\n");
 
         writer.append("        switch (node.at_pos_boxed(tc, 0).get_str(tc)) {\n");
@@ -71,6 +71,12 @@ private void writeBuildMethod(TypeMirror nodeClass, TypeMirror nodesClass, Print
                     writer.append("build(node.at_pos_boxed(tc, " + (i+1) + "), scope, tc)");
                 } else if (paramType.equals(nodesClass)) {
                     writer.append("expressions(node, " + (i+1) + ", scope, tc)");
+                } else if (paramType.equals(intClass)) {
+                    writer.append("node.at_pos_boxed(tc, " + (i+1) + ").get_int(tc)");
+                } else if (paramType.equals(numClass)) {
+                    writer.append("node.at_pos_boxed(tc, " + (i+1) + ").get_num(tc)");
+                } else if (paramType.equals(strClass)) {
+                    writer.append("node.at_pos_boxed(tc, " + (i+1) + ").get_str(tc)");
                 } else {
                     processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Wrong param type: " + paramType.toString());
                 }
@@ -106,6 +112,9 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
             TypeMirror nodeClass = null;
             TypeMirror nodesClass = null;
+            TypeMirror intClass = null;
+            TypeMirror numClass = null;
+            TypeMirror strClass = null;
 
             try {
                 annotation.nodeClass();
@@ -119,6 +128,24 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 nodesClass = e.getTypeMirror();
             }
 
+            try {
+                annotation.intClass();
+            } catch (MirroredTypeException e) {
+                intClass = e.getTypeMirror();
+            }
+
+            try {
+                annotation.numClass();
+            } catch (MirroredTypeException e) {
+                numClass = e.getTypeMirror();
+            }
+
+            try {
+                annotation.strClass();
+            } catch (MirroredTypeException e) {
+                strClass = e.getTypeMirror();
+            }
+
             String builderClass =  type.getQualifiedName().toString();
             String generatedClassQualified = builderClass + "Gen";
             String generatedClassSimple = type.getSimpleName().toString() + "Gen";
@@ -136,7 +163,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
                     writer.append("public class " + generatedClassSimple + " extends " + builderClass + " {\n");
 
-                    writeBuildMethod(nodeClass, nodesClass, writer, roundEnv);
+                    writeBuildMethod(nodeClass, nodesClass, intClass, numClass, strClass, writer, roundEnv);
 
                     writer.append("}\n");
                 }

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

@@ -13,10 +13,6 @@
 import org.perl6.nqp.truffle.nodes.NQPBlockBodyNode;
 import org.perl6.nqp.truffle.nodes.control.NQPBlockNode;
 
-import org.perl6.nqp.truffle.nodes.expression.NQPIValNode;
-import org.perl6.nqp.truffle.nodes.expression.NQPSValNode;
-import org.perl6.nqp.truffle.nodes.expression.NQPNValNode;
-
 import org.perl6.nqp.truffle.nodes.io.NQPSayNode;
 import org.perl6.nqp.truffle.nodes.io.NQPPrintNode;
 
@@ -36,7 +32,13 @@
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 import org.perl6.nqp.dsl.AstBuilder;
 
-@AstBuilder(nodeClass = NQPNode.class, nodesClass = NQPNode[].class)
+@AstBuilder(
+    nodeClass = NQPNode.class,
+    nodesClass = NQPNode[].class,
+    intClass = long.class,
+    numClass = double.class,
+    strClass = String.class
+)
 
 abstract class TruffleCompiler {
     public void run(SixModelObject node, ThreadContext tc) {
@@ -68,12 +70,6 @@ public NQPNode build(SixModelObject node, NQPScope scope, ThreadContext tc) {
         if (trySimple != null) return trySimple;
 
         switch (node.at_pos_boxed(tc, 0).get_str(tc)) {
-            case "ival":
-                return new NQPIValNode(node.at_pos_boxed(tc, 1).get_int(tc));
-            case "nval":
-                return new NQPNValNode(node.at_pos_boxed(tc, 1).get_num(tc));
-            case "sval":
-                return new NQPSValNode(node.at_pos_boxed(tc, 1).get_str(tc));
             case "unless":
             case "if":
                 return new NQPIfNode(

src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPIValNode.java

@@ -44,11 +44,14 @@
 import com.oracle.truffle.api.nodes.NodeInfo;
 import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.nodes.NQPIntNode;
+import org.perl6.nqp.truffle.runtime.Coercions;
+import org.perl6.nqp.dsl.Deserializer;
 
 @NodeInfo(shortName = "const")
 public final class NQPIValNode extends NQPIntNode {
     private final long value;
 
+    @Deserializer
     public NQPIValNode(long value) {
         this.value = value;
     }

src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPNValNode.java

@@ -44,11 +44,13 @@
 import com.oracle.truffle.api.nodes.NodeInfo;
 import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.nodes.NQPNumNode;
+import org.perl6.nqp.dsl.Deserializer;
 
 @NodeInfo(shortName = "const")
 public final class NQPNValNode extends NQPNumNode {
     private final double value;
 
+    @Deserializer
     public NQPNValNode(double value) {
         this.value = value;
     }

src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSValNode.java

@@ -44,11 +44,13 @@
 import com.oracle.truffle.api.nodes.NodeInfo;
 import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.nodes.NQPStrNode;
+import org.perl6.nqp.dsl.Deserializer;
 
 @NodeInfo(shortName = "const")
 public final class NQPSValNode extends NQPStrNode {
     private final String value;
 
+    @Deserializer
     public NQPSValNode(String value) {
         this.value = value;
     }