 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.315 2021/07/11 20:07:41 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 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.315 2021/07/11 20:07:41 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 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.
 @@ -271,27 +271,30 @@ anonymize(sym_t *s)
 %left	T_EQUALITY
 %left	T_RELATIONAL
 %left	T_SHIFT
 %left	T_ADDITIVE
 %left	T_ASTERISK T_MULTIPLICATIVE
 %token	<y_name>	T_NAME
 %token	<y_name>	T_TYPENAME
 %token	<y_val>		T_CON
 %token	<y_string>	T_STRING
 %type	<y_tnode>	primary_expression
 %type	<y_tnode>	postfix_expression
 %type	<y_tnode>	argument_expression_list
 %type	<y_tnode>	unary_expression
 %type	<y_tnode>	cast_expression
 %type	<y_tnode>	expr
 %type	<y_sym>		func_decl
 %type	<y_sym>		notype_decl
 %type	<y_sym>		type_decl
 %type	<y_type>	type_specifier
 %type	<y_type>	begin_type_typespec
 %type	<y_type>	notype_type_specifier
 %type	<y_type>	struct_or_union_specifier
 %type	<y_type>	enum_specifier
 %type	<y_tspec>	struct_or_union
 %type	<y_sym>		braced_struct_declaration_list
 %type	<y_sym>		identifier_sym
 %type	<y_name>	identifier
 @@ -317,33 +320,30 @@ anonymize(sym_t *s)
 %type	<y_sym>		abstract_decl_param_list
 %type	<y_sym>		direct_param_decl
 %type	<y_sym>		notype_param_decl
 %type	<y_sym>		direct_notype_param_decl
 %type	<y_qual_ptr>	type_qualifier_list_opt
 %type	<y_qual_ptr>	type_qualifier_list
 %type	<y_qual_ptr>	type_qualifier
 %type	<y_sym>		identifier_list
 %type	<y_sym>		abstract_declarator
 %type	<y_sym>		direct_abstract_declarator
 %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>	argument_expression_list
 %type	<y_op>		point_or_arrow
 %type	<y_type>	type_name
 %type	<y_sym>		abstract_declaration
 %type	<y_tnode>	do_while_expr
 %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
 @@ -621,27 +621,27 @@ type_attribute:			/* See C11 6.7 declara
+	;
 type_specifier:			/* C99 6.7.2 */
 	  notype_type_specifier
 	| T_TYPENAME {
 		$$ = getsym($1)->s_type;
+	  }
+	;
 notype_type_specifier:
 	  T_TYPE {
 		$$ = gettyp($1);
+	  }
-	| T_TYPEOF term {
+	| T_TYPEOF cast_expression {	/* GCC extension */
 		$$ = $2->tn_type;
+	  }
 	| struct_or_union_specifier {
 		end_declaration_level();
 		$$ = $1;
+	  }
 	| enum_specifier {
 		end_declaration_level();
 		$$ = $1;
+	  }
+	;
 struct_or_union_specifier:	/* C99 6.7.2.1 */
 @@ -1343,27 +1343,27 @@ abstract_declaration:
 	| begin_type_noclass_declspecs end_type abstract_declarator {
 		$$ = declare_1_abstract($3);
+	  }
+	;
 abstract_declarator:		/* C99 6.7.6 */
 	  pointer {
 		$$ = add_pointer(abstract_name(), $1);
+	  }
 	| direct_abstract_declarator
 	| pointer direct_abstract_declarator {
 		$$ = add_pointer($2, $1);
+	  }
-	| T_TYPEOF term {	/* GCC extension */
+	| T_TYPEOF cast_expression {	/* GCC extension */
 		$$ = mktempsym($2->tn_type);
+	  }
+	;
 direct_abstract_declarator:		/* C99 6.7.6 */
 	  T_LPAREN abstract_declarator T_RPAREN {
 		$$ = $2;
+	  }
 	| T_LBRACK T_RBRACK {
 		$$ = add_array(abstract_name(), false, 0);
+	  }
 	| T_LBRACK array_size T_RBRACK {
 		$$ = add_array(abstract_name(), true, to_int_constant($2, false));
 @@ -1711,28 +1711,28 @@ expr:				/* C99 6.5 */
+	  }
 	| expr T_QUEST expr T_COLON expr {
 		$$ = build(QUEST, $1, build(COLON, $3, $5));
+	  }
 	| expr T_ASSIGN expr {
 		$$ = build(ASSIGN, $1, $3);
+	  }
 	| expr T_OPASSIGN expr {
 		$$ = build($2, $1, $3);
+	  }
 	| expr T_COMMA expr {
 		$$ = build(COMMA, $1, $3);
+	  }
-	| term
+	| cast_expression
-	| generic_selection
+	| generic_selection	/* TODO: move to primary_expression */
+	;
 assignment_expression:		/* C99 6.5.16 */
 	  expr %prec T_ASSIGN
+	;
 primary_expression:		/* C99 6.5.1 */
 	  T_NAME {
 		/* XXX really necessary? */
 		if (yychar < 0)
 			yychar = yylex();
 		$$ = new_name_node(getsym($1), yychar);
+	  }
 @@ -1808,70 +1808,70 @@ postfix_expression:		/* C99 6.5.2 */
 		/* ({ }) is a GCC extension */
 		gnuism(320);
 	  } compound_statement_rbrace T_RPAREN {
 		$$ = new_name_node(*current_initsym(), 0);
 		end_initialization();
+	  }
+	;
 unary_expression:		/* C99 6.5.3 */
 	  postfix_expression
 	| T_INCDEC unary_expression {
 		$$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL);
+	  }
-	| T_AMPER term {
+	| T_AMPER cast_expression {
 		$$ = build(ADDR, $2, NULL);
+	  }
-	| T_ASTERISK term {
+	| T_ASTERISK cast_expression {
 		$$ = build(INDIR, $2, NULL);
+	  }
-	| T_ADDITIVE term {
+	| T_ADDITIVE cast_expression {
 		if (tflag && $1 == PLUS) {
 			/* unary + is illegal in traditional C */
 			warning(100);
+		}
 		$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
+	  }
-	| T_COMPLEMENT term {
+	| T_COMPLEMENT cast_expression {
 		$$ = build(COMPL, $2, NULL);
+	  }
-	| T_LOGNOT term {
+	| T_LOGNOT cast_expression {
 		$$ = build(NOT, $2, NULL);
+	  }
-	| T_REAL term {		/* GCC c_parser_unary_expression */
+	| T_REAL cast_expression {	/* GCC c_parser_unary_expression */
 		$$ = build(REAL, $2, NULL);
+	  }
-	| T_IMAG term {		/* GCC c_parser_unary_expression */
+	| T_IMAG cast_expression {	/* GCC c_parser_unary_expression */
 		$$ = build(IMAG, $2, NULL);
+	  }
-	| T_EXTENSION term {	/* GCC c_parser_unary_expression */
+	| T_EXTENSION cast_expression {	/* GCC c_parser_unary_expression */
 		$$ = $2;
+	  }
 	| T_SIZEOF unary_expression {
 		$$ = $2 == NULL ? NULL : build_sizeof($2->tn_type);
 		if ($$ != NULL)
 			check_expr_misc($2, false, false, false, false, false, true);
+	  }
 	| T_SIZEOF T_LPAREN type_name T_RPAREN {
 		$$ = build_sizeof($3);
+	  }
 	| T_ALIGNOF T_LPAREN type_name T_RPAREN {	/* C11 6.5.3 */
 		$$ = build_alignof($3);
+	  }
+	;
-term:				/* see C99 6.5.1 */
+cast_expression:		/* see C99 6.5.1 */
 	  unary_expression
-	| T_LPAREN type_name T_RPAREN term {
+	| T_LPAREN type_name T_RPAREN cast_expression {
 		$$ = cast($4, $2);
+	  }
+	;
 generic_selection:		/* C11 6.5.1.1 */
 	  T_GENERIC T_LPAREN assignment_expression T_COMMA
 	    generic_assoc_list T_RPAREN {
 	  	/* generic selection requires C11 or later */
 	  	c11ism(345);
 		$$ = build_generic_selection($3, $5);
+	  }
+	;