glayzzle#345 - impl https://wiki.php.net/rfc/trailing-comma-function-calls

Author: ichiriac

src/parser.js

@@ -34,6 +34,7 @@ const parser = function(lexer, ast) {
   this.prev = null;
   this.debug = false;
   this.php7 = true;
+  this.php73 = true;
   this.php74 = true;
   this.extractDoc = false;
   this.extractTokens = false;
@@ -264,6 +265,7 @@ parser.prototype.parse = function(code, filename) {
     this._tokens = null;
   }
   if (!this.php7) {
+    this.php73 = false;
     this.php74 = false;
   }
   this._docIndex = 0;

src/parser/expr.js

@@ -215,7 +215,7 @@ module.exports = {
         if (this.next().expect("(")) {
           this.next();
         }
-        const variables = this.read_list(this.read_expr, ",");
+        const variables = this.read_function_list(this.read_expr, ",");
         if (this.expect(")")) {
           this.next();
         }

src/parser/function.js

@@ -218,24 +218,22 @@ module.exports = {
    * ```
    */
   read_function_argument_list: function() {
-    const result = [];
+    let result = [];
     let wasVariadic = false;
     this.expect("(") && this.next();
     if (this.token !== ")") {
-      while (this.token != this.EOF) {
+      result = this.read_function_list(function() {
         const argument = this.read_argument_list();
         if (argument) {
-          result.push(argument);
-          if (argument.kind === "variadic") {
-            wasVariadic = true;
-          } else if (wasVariadic) {
+          if (wasVariadic) {
             this.raiseError("Unexpected argument after a variadic argument");
           }
+          if (argument.kind === "variadic") {
+            wasVariadic = true;
+          }  
         }
-        if (this.token === ",") {
-          this.next();
-        } else break;
-      }
+        return argument;
+      }.bind(this), ',');
     }
     this.expect(")") && this.next();
     return result;

src/parser/statement.js

@@ -264,7 +264,7 @@ module.exports = {
         const result = this.node("echo");
         const text = this.text();
         const shortForm = text === "<?=" || text === "<%=";
-        const expressions = this.next().read_list(this.read_expr, ",");
+        const expressions = this.next().read_function_list(this.read_expr, ",");
         this.expectEndOfStatement();
         return result(expressions, shortForm);
       }
@@ -294,7 +294,7 @@ module.exports = {
       case this.tok.T_UNSET: {
         const result = this.node("unset");
         this.next().expect("(") && this.next();
-        const variables = this.read_list(this.read_variable, ",");
+        const variables = this.read_function_list(this.read_variable, ",");
         this.expect(")") && this.next();
         this.expect(";") && this.next();
         return result(variables);

src/parser/utils.js

@@ -23,6 +23,30 @@ module.exports = {
     return body(null, items);
   },
 
+  /**
+   * https://wiki.php.net/rfc/trailing-comma-function-calls
+   * @param {*} item 
+   * @param {*} separator 
+   */
+  read_function_list: function(item, separator) {
+    const result = [];
+    do {
+      if (this.token == separator && this.php73 && result.length > 0) {
+        result.push(this.node('noop')());
+        break;
+      }
+      result.push(item.apply(this, []));
+      if (this.token != separator) {
+        break;
+      }
+      if (this.next().token == ')'  && this.php73) {
+        result.push(this.node('noop')());
+        break;
+      } 
+    } while (this.token != this.EOF);
+    return result;
+  },
+
   /**
    * Helper : reads a list of tokens / sample : T_STRING ',' T_STRING ...
    * ```ebnf

test/debug.js

@@ -17,10 +17,14 @@
 const util = require('util');
 const parser = require("../src/index");
 const ast = parser.parseEval(`
-@$var += 10
+$foo = new Foo(
+  'constructor',
+  'bar',
+);
 `, { 
     parser: {
       debug: true,
+      php73: true,
       extractDoc: true
     },
     /*ast: {

test/snapshot/__snapshots__/graceful.test.js.snap

@@ -506,6 +506,9 @@ Program {
             "kind": "variable",
             "name": "arg",
           },
+          Noop {
+            "kind": "noop",
+          },
         ],
         "kind": "call",
         "what": PropertyLookup {
@@ -539,6 +542,9 @@ Program {
               "kind": "variable",
               "name": "baz",
             },
+            Noop {
+              "kind": "noop",
+            },
           ],
           "kind": "new",
           "what": ClassReference {
@@ -550,6 +556,10 @@ Program {
       },
       "kind": "expressionstatement",
     },
+    ExpressionStatement {
+      "expression": undefined,
+      "kind": "expressionstatement",
+    },
     ExpressionStatement {
       "expression": Variable {
         "curly": false,
@@ -564,33 +574,26 @@ Program {
     },
   ],
   "errors": Array [
-    Error {
-      "expected": "EXPR",
-      "kind": "error",
-      "line": 2,
-      "message": "Parse Error : syntax error, unexpected ')' on line 2",
-      "token": "')'",
-    },
     Error {
       "expected": ")",
       "kind": "error",
-      "line": 2,
-      "message": "Parse Error : syntax error, unexpected ';', expecting ')' on line 2",
-      "token": "';'",
+      "line": 3,
+      "message": "Parse Error : syntax error, unexpected ',', expecting ')' on line 3",
+      "token": "','",
     },
     Error {
-      "expected": "EXPR",
+      "expected": ";",
       "kind": "error",
       "line": 3,
-      "message": "Parse Error : syntax error, unexpected ',' on line 3",
+      "message": "Parse Error : syntax error, unexpected ',', expecting ';' on line 3",
       "token": "','",
     },
     Error {
-      "expected": ")",
+      "expected": "EXPR",
       "kind": "error",
       "line": 3,
-      "message": "Parse Error : syntax error, unexpected '$foo' (T_VARIABLE), expecting ')' on line 3",
-      "token": "'$foo' (T_VARIABLE)",
+      "message": "Parse Error : syntax error, unexpected ',' on line 3",
+      "token": "','",
     },
     Error {
       "expected": ";",