[truffle] Auto-generate the TAST deserialization for if nodes too

Author: pmurias

src/vm/jvm/Truffle.nqp

@@ -280,9 +280,9 @@ class QAST::OperationsTruffle {
             my $cond := $comp.as_truffle($node[0], :want($OBJ));
             my $then := $comp.as_truffle($node[1], :want($result_type));
 
-            my @tree := [$op_name, $cond.tree, $then.tree];
-
-            nqp::push(@tree, $comp.as_truffle($node[2], :want($result_type)).tree) if $operands == 3;
+            my @tree := $operands == 3
+                  ?? [$op_name ~ '-else', $cond.tree, $then.tree, $comp.as_truffle($node[2], :want($result_type)).tree]
+                  !! [$op_name, $cond.tree, $then.tree];
 
             return TAST.new($result_type, @tree);
         });

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

@@ -57,13 +57,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 "unless":
-            case "if":
-                return new NQPIfNode(
-                    node.at_pos_boxed(tc, 0).get_str(tc) == "unless",
-                    build(node.at_pos_boxed(tc, 1), scope, tc),
-                    build(node.at_pos_boxed(tc, 2), scope, tc),
-                    node.elems(tc) == 4 ? build(node.at_pos_boxed(tc, 3), scope, tc) : null);
             case "declare-lexical":
                 scope.addLexical(node.at_pos_boxed(tc, 1).get_str(tc));
                 return build(node.at_pos_boxed(tc, 2), scope, tc);

src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/control/NQPIfNode.java

@@ -46,6 +46,7 @@
 import org.perl6.nqp.truffle.nodes.NQPNode;
 import org.perl6.nqp.truffle.nodes.NQPNodeWithBoolification;
 
+import org.perl6.nqp.dsl.Deserializer;
 
 @NodeInfo(shortName = "if")
 public final class NQPIfNode extends NQPNodeWithBoolification {
@@ -88,4 +89,19 @@ public void executeVoid(VirtualFrame frame) {
             }
         }
     }
+
+    @Deserializer("if")
+    public static NQPIfNode createIf(NQPNode condNode, NQPNode thenNode) {
+        return new NQPIfNode(false, condNode, thenNode, null);
+    }
+
+    @Deserializer("unless")
+    public static NQPIfNode createUnless(NQPNode condNode, NQPNode thenNode) {
+        return new NQPIfNode(true, condNode, thenNode, null);
+    }
+
+    @Deserializer("if-else")
+    public static NQPIfNode createIfElse(NQPNode condNode, NQPNode thenNode, NQPNode elseNode) {
+        return new NQPIfNode(false, condNode, thenNode, elseNode);
+    }
 }