add the variadic node

Author: ichiriac

docs/AST.md

@@ -19,6 +19,7 @@
     -   [Expression](#expression)
         -   [Array](#array)
         -   [Variable](#variable)
+        -   [Variadic](#variadic)
         -   [ConstRef](#constref)
         -   [Lookup](#lookup)
             -   [PropertyLookup](#propertylookup)
@@ -1057,6 +1058,16 @@ be any expression in general, an expression can also be a pattern.
 -   `name` **([String](#string) \| [Node](#node))** 
 -   `byref` **[boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
 
+# Variadic
+
+**Extends Expression**
+
+Introduce a list of items into the arguments of the call
+
+**Properties**
+
+-   `what` **([Array](#array) \| [Expression](#expression))** 
+
 # While
 
 **Extends Statement**

src/ast.js

@@ -25,6 +25,7 @@ var Position = require('./ast/position');
  *   - [Expression](#expression)
  *     - [Array](#array)
  *     - [Variable](#variable)
+ *     - [Variadic](#variadic)
  *     - [ConstRef](#constref)
  *     - [Lookup](#lookup)
  *       - [PropertyLookup](#propertylookup)
@@ -245,6 +246,7 @@ AST.prototype.prepare = function(kind, parser) {
   require('./ast/usegroup'),
   require('./ast/useitem'),
   require('./ast/variable'),
+  require('./ast/variadic'),
   require('./ast/while')
 ].forEach(function (ctor) {
   var kind = ctor.prototype.constructor.name.toLowerCase();

src/ast/variadic.js

@@ -0,0 +1,22 @@
+/*!
+ * Copyright (C) 2017 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+var Expr = require('./expression');
+var KIND = 'variadic';
+
+/**
+ * Introduce a list of items into the arguments of the call
+ * @constructor Variadic
+ * @extends {Expression}
+ * @property {Array|Expression} what
+ * @see https://wiki.php.net/rfc/argument_unpacking
+ */
+var Variadic = Expr.extends(function Variadic(what, location) {
+  Expr.apply(this, [KIND, location]);
+  this.what = what;
+});
+
+module.exports = Variadic;

src/parser/function.js

@@ -178,10 +178,17 @@ module.exports = {
    */
   ,read_function_argument_list: function() {
     var result = [];
+    var wasVariadic = false;
     this.expect('(') && this.next();
     if (this.token !== ')') {
       while(this.token != this.EOF) {
-        result.push(this.read_argument_list());
+        var argument = this.read_argument_list();
+        result.push(argument);
+        if (argument.kind === 'variadic') {
+          wasVariadic = true;
+        } else if (wasVariadic) {
+          this.raiseError('Unexpected argument after a variadic argument');
+        }
         if (this.token === ',') {
           this.next();
         } else break;

test/functionTests.js

@@ -6,9 +6,25 @@ describe('Function tests', function() {
     'function &foo($a = 1, callable $b, ?array &...$params) : ?boolean {}',
     '$a = function &($b) use($c) : array {',
     '  return true;',
-    '};'
+    '};',
+    '$b = foo(...[1, null, 1, 2, 3]);'
   ].join('\n'));
 
+
+  it('test variadic error', function () {
+    var astErr = parser.parseEval([
+      '$b = foo(...[1, 2, 3], $a);'
+    ].join('\n'), {
+      parser: {
+        suppressErrors: true
+      }
+    });
+    var msg = 'Unexpected argument after a variadic argument on line 1';
+    astErr.errors.length.should.be.exactly(1);
+    astErr.errors[0].line.should.be.exactly(1);
+    astErr.errors[0].message.should.be.exactly(msg);
+  });
+
   it('test description', function () {
     // Get result from parser
     ast.children[0].kind.should.be.exactly('function');