Merge remote-tracking branch 'origin/master' into cmake

1 files changed, 15 insertions, 3 deletions

diff --git a/awkgram.y b/awkgram.y
index 71e70de5..14520cd1 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1236,11 +1236,23 @@ expression_list
 	| error
 	  { $$ = NULL; }
 	| expression_list error
-	  { $$ = NULL; }
+	  {
+		/*
+		 * Returning the expression list instead of NULL lets
+		 * snode get a list of arguments that it can count.
+		 */
+		$$ = $1;
+	  }
 	| expression_list error exp
-	  { $$ = NULL; }
+	  {
+		/* Ditto */
+		$$ = mk_expression_list($1, $3);
+	  }
 	| expression_list comma error
-	  { $$ = NULL; }
+	  {
+		/* Ditto */
+		$$ = $1;
+	  }
 	;
 
 /* Expressions, not including the comma operator.  */