Fix XHPAST parsing of variadic calls

Summary:
Depends on D21066. Ref T13492. The switch of unit test data to stable/readable output exposed this bug in parsing of variadic calls: some nodes are not given types properly.

Fix the parser and update the test.

Test Plan: Ran the test, which now works.

Maniphest Tasks: T13492

Differential Revision: https://secure.phabricator.com/D21067

src/parser/xhpast/__tests__/data/variadic.php.test

@@ -131,17 +131,27 @@ pass
     * n_CALL_PARAMETER_LIST
      > (
      * n_UNPACK
-      * "<INVALID TYPE \"0\">"
+      > ...
-       > ...
+      * n_ARRAY_LITERAL
-     > [
+       * n_ARRAY_VALUE_LIST
-     > 1
+        > [
-     > ,
+        * n_ARRAY_VALUE
-     > " "
+         * n_EMPTY
-     > 2
+         * n_NUMERIC_SCALAR
-     > ,
+          > 1
-     > " "
+        > ,
-     > 3
+        > " "
-     > ]
+        * n_ARRAY_VALUE
+         * n_EMPTY
+         * n_NUMERIC_SCALAR
+          > 2
+        > ,
+        > " "
+        * n_ARRAY_VALUE
+         * n_EMPTY
+         * n_NUMERIC_SCALAR
+          > 3
+        > ]
      > )
    > ;
   > "\n\n"
@@ -152,9 +162,9 @@ pass
     * n_CALL_PARAMETER_LIST
      > (
      * n_UNPACK
-      * "<INVALID TYPE \"0\">"
+      > ...
-       > ...
+      * n_VARIABLE
-     > $foo
+       > $foo
      > )
    > ;
  > "\n\n"

src/parser/xhpast/bin/PhutilXHPASTBinary.php

@@ -8,7 +8,7 @@ final class PhutilXHPASTBinary extends Phobject {
    * This is the version that would be obtained with an up-to-date XHPAST
    * build. The //actual// XHPAST build version may vary.
    */
-  const EXPECTED_VERSION = '7.1.4';
+  const EXPECTED_VERSION = '7.1.5';
 
   /**
    * The XHPAST build version.

support/xhpast/parser.y

@@ -1051,8 +1051,8 @@ non_empty_parameter_list:
 
 parameter:
   T_ELLIPSIS T_VARIABLE {
-    $$ = NTYPE($1, n_UNPACK);
+    NTYPE($1, n_UNPACK);
-    $$->appendChild(NTYPE($2, n_VARIABLE));
+    $$ = $1->appendChild(NTYPE($2, n_VARIABLE));
   }
 | T_VARIABLE {
     $$ = NTYPE($1, n_VARIABLE);
@@ -1111,7 +1111,8 @@ non_empty_function_call_parameter_list:
 argument:
   expr
 | T_ELLIPSIS expr {
-    $$ = NNEW(n_UNPACK)->appendChild($1);
+    NTYPE($1, n_UNPACK);
+    $$ = $1->appendChild($2);
   }
 | '&' w_variable {
     NTYPE($1, n_VARIABLE_REFERENCE);