 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.297 2021/07/10 17:46:55 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.298 2021/07/10 18:13:06 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.297 2021/07/10 17:46:55 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.298 2021/07/10 18:13:06 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration, used for symbol table entries.
  * 0 is the top-level, > 0 is inside a function body.
 @@ -319,27 +319,27 @@ anonymize(sym_t *s)
 %type	<y_sym>		identifier_list
 %type	<y_sym>		abstract_declarator
 %type	<y_sym>		direct_abstract_declarator
 %type	<y_sym>		direct_abstract_declarator_postfix
 %type	<y_sym>		vararg_parameter_type_list
 %type	<y_sym>		parameter_type_list
 %type	<y_sym>		parameter_declaration
 %type	<y_tnode>	expr
 %type	<y_tnode>	assignment_expression
 %type	<y_tnode>	gcc_statement_expr_list
 %type	<y_tnode>	gcc_statement_expr_item
 %type	<y_tnode>	term
 %type	<y_tnode>	generic_selection
-%type	<y_tnode>	func_arg_list
+%type	<y_tnode>	argument_expression_list
 %type	<y_op>		point_or_arrow
 %type	<y_type>	type_name
 %type	<y_sym>		abstract_declaration
 %type	<y_tnode>	expr_opt
 %type	<y_string>	string
 %type	<y_string>	string2
 %type	<y_name>	asm_or_symbolrename_opt
 %type	<y_range>	range
 %type	<y_seen_statement> block_item_list
 %type	<y_seen_statement> block_item
 %type	<y_generic>	generic_assoc_list
 %type	<y_generic>	generic_association
 @@ -1721,27 +1721,27 @@ term:				/* see C99 6.5.1 */
 	| T_ADDITIVE term {
 		if (tflag && $1 == PLUS) {
 			/* unary + is illegal in traditional C */
 			warning(100);
+		}
 		$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
+	  }
 	| term T_LBRACK expr T_RBRACK {
 		$$ = build(INDIR, build(PLUS, $1, $3), NULL);
+	  }
 	| term T_LPAREN T_RPAREN {
 		$$ = new_function_call_node($1, NULL);
+	  }
-	| term T_LPAREN func_arg_list T_RPAREN {
+	| term T_LPAREN argument_expression_list T_RPAREN {
 		$$ = new_function_call_node($1, $3);
+	  }
 	| term point_or_arrow T_NAME {
 		if ($1 != NULL) {
 			sym_t	*msym;
 			/*
 			 * XXX struct_or_union_member should be integrated
 			 * in build()
 			 */
 			if ($2 == ARROW) {
 				/*
 				 * must do this before struct_or_union_member
 				 * is called
 @@ -1814,26 +1814,35 @@ generic_assoc_list:		/* C11 6.5.1.1 */
 generic_association:		/* C11 6.5.1.1 */
 	  type_name T_COLON assignment_expression {
 		$$ = getblk(sizeof(*$$));
 		$$->ga_arg = $1;
 		$$->ga_result = $3;
+	  }
 	| T_DEFAULT T_COLON assignment_expression {
 		$$ = getblk(sizeof(*$$));
 		$$->ga_arg = NULL;
 		$$->ga_result = $3;
+	  }
+	;
 argument_expression_list:	/* C99 6.5.2 */
 	  expr %prec T_COMMA {
 		$$ = new_function_argument_node(NULL, $1);
+	  }
 	| argument_expression_list T_COMMA expr {
 		$$ = new_function_argument_node($1, $3);
+	  }
+	;
 /*
  * The inner part of a GCC statement-expression of the form ({ ... }).
+ *
  * https://gcc.gnu.org/onlinedocs/gcc/Statement-Exprs.html
  */
 gcc_statement_expr_list:
 	  gcc_statement_expr_item
 	| gcc_statement_expr_list gcc_statement_expr_item {
 		$$ = $2;
+	  }
+	;
 gcc_statement_expr_item:
 @@ -1870,35 +1879,26 @@ string:
 string2:
 	  T_STRING {
 		if (tflag) {
 			/* concatenated strings are illegal in traditional C */
 			warning(219);
+		}
 		$$ = $1;
+	  }
 	| string2 T_STRING {
 		$$ = cat_strings($1, $2);
+	  }
+	;
 func_arg_list:
 	  expr %prec T_COMMA {
 		$$ = new_function_argument_node(NULL, $1);
 	| func_arg_list T_COMMA expr {
 		$$ = new_function_argument_node($1, $3);
 point_or_arrow:
 	  T_POINT {
 		symtyp = FMEMBER;
 		$$ = POINT;
+	  }
 	| T_ARROW {
 		symtyp = FMEMBER;
 		$$ = ARROW;
+	  }
+	;
 identifier:			/* C99 6.4.2.1 */
 	  T_NAME {