Add tolerance for multiple commas in function arguments - closes niki…

…c#616
iluuu1994 · Jun 28, 2019 · c0041a3 · c0041a3
1 parent 3cf61fd
commit c0041a3
Show file tree

Hide file tree

Showing 4 changed files with 1,173 additions and 1,095 deletions.
diff --git a/grammar/php7.y b/grammar/php7.y
@@ -68,12 +68,18 @@ semi:
 
 no_comma:
       /* empty */ { /* nothing */ }
-    | ',' { $this->emitError(new Error('A trailing comma is not allowed here', attributes())); }
+    | ',' no_comma { $this->emitError(new Error('A trailing comma is not allowed here', attributes())); }
 ;
 
 optional_comma:
       /* empty */
-    | ','
+    | comma
+;
+
+comma:
+      ',' { /* nothing */ }
+    | ',' comma { $this->emitError(new Error('Only one comma was expected', attributes())); }
+;
 
 top_statement:
       statement                                             { $$ = $1; }
@@ -481,13 +487,13 @@ optional_return_type:
 ;
 
 argument_list:
-      '(' ')'                                               { $$ = array(); }
+      '(' no_comma ')'                                               { $$ = array(); }
     | '(' non_empty_argument_list optional_comma ')'        { $$ = $2; }
 ;
 
 non_empty_argument_list:
       argument                                              { init($1); }
-    | non_empty_argument_list ',' argument                  { push($1, $3); }
+    | non_empty_argument_list comma argument                  { push($1, $3); }
 ;
 
 argument: