 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.324 2021/07/14 17:19:37 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.325 2021/07/15 17:20:57 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.324 2021/07/14 17:19:37 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.325 2021/07/15 17:20:57 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.
 @@ -285,29 +285,30 @@ anonymize(sym_t *s)
 %type	<y_string>	string2
 %type	<y_tnode>	primary_expression
 %type	<y_tnode>	generic_selection
 %type	<y_generic>	generic_assoc_list
 %type	<y_generic>	generic_association
 %type	<y_tnode>	postfix_expression
 %type	<y_tnode>	gcc_statement_expr_list
 %type	<y_tnode>	gcc_statement_expr_item
 %type	<y_op>		point_or_arrow
 %type	<y_tnode>	argument_expression_list
 %type	<y_tnode>	unary_expression
 %type	<y_tnode>	cast_expression
 %type	<y_tnode>	conditional_expression
 %type	<y_tnode>	assignment_expression
 %type	<y_tnode>	expression_opt
 %type	<y_tnode>	expression
 %type	<y_tnode>	assignment_expression
 %type	<y_tnode>	constant_expr
 %type	<y_type>	begin_type_typespec
 %type	<y_type>	type_specifier
 %type	<y_type>	notype_type_specifier
 %type	<y_type>	struct_or_union_specifier
 %type	<y_tspec>	struct_or_union
 %type	<y_sym>		braced_struct_declaration_list
 %type	<y_sym>		struct_declaration_list_with_rbrace
 %type	<y_sym>		struct_declaration_list
 %type	<y_sym>		struct_declaration
 %type	<y_sym>		notype_struct_declarators
 %type	<y_sym>		type_struct_declarators
 @@ -552,30 +553,30 @@ gcc_statement_expr_item:
 point_or_arrow:			/* helper for 'postfix_expression' */
 	  T_POINT {
 		symtyp = FMEMBER;
 		$$ = POINT;
+	  }
 	| T_ARROW {
 		symtyp = FMEMBER;
 		$$ = ARROW;
+	  }
+	;
 /* K&R 7.1, C90 ???, C99 6.5.2, C11 6.5.2 */
 argument_expression_list:
-	  expression %prec T_COMMA {
+	  assignment_expression {
 		$$ = new_function_argument_node(NULL, $1);
+	  }
-	| argument_expression_list T_COMMA expression {
+	| argument_expression_list T_COMMA assignment_expression {
 		$$ = new_function_argument_node($1, $3);
+	  }
+	;
 /* K&R 7.2, C90 ???, C99 6.5.3, C11 6.5.3 */
 unary_expression:
 	  postfix_expression
 	| T_INCDEC unary_expression {
 		$$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL);
+	  }
 	| T_AMPER cast_expression {
 		$$ = build(ADDR, $2, NULL);
+	  }
 @@ -625,105 +626,108 @@ cast_expression:
 	  unary_expression
 	| T_LPAREN type_name T_RPAREN cast_expression {
 		$$ = cast($4, $2);
+	  }
+	;
 expression_opt:
 	  /* empty */ {
 		$$ = NULL;
+	  }
 	| expression
+	;
-/* 'expression' also implements 'multiplicative_expression'. */
+/* 'conditional_expression' also implements 'multiplicative_expression'. */
-/* 'expression' also implements 'additive_expression'. */
+/* 'conditional_expression' also implements 'additive_expression'. */
-/* 'expression' also implements 'shift_expression'. */
+/* 'conditional_expression' also implements 'shift_expression'. */
-/* 'expression' also implements 'relational_expression'. */
+/* 'conditional_expression' also implements 'relational_expression'. */
-/* 'expression' also implements 'equality_expression'. */
+/* 'conditional_expression' also implements 'equality_expression'. */
-/* 'expression' also implements 'AND_expression'. */
+/* 'conditional_expression' also implements 'AND_expression'. */
-/* 'expression' also implements 'exclusive_OR_expression'. */
+/* 'conditional_expression' also implements 'exclusive_OR_expression'. */
-/* 'expression' also implements 'inclusive_OR_expression'. */
+/* 'conditional_expression' also implements 'inclusive_OR_expression'. */
-/* 'expression' also implements 'logical_AND_expression'. */
+/* 'conditional_expression' also implements 'logical_AND_expression'. */
-/* 'expression' also implements 'logical_OR_expression'. */
+/* 'conditional_expression' also implements 'logical_OR_expression'. */
-/* 'expression' also implements 'conditional_expression'. */
+/* K&R ???, C90 ???, C99 6.5.5 to 6.5.15, C11 6.5.5 to 6.5.15 */
-/* 'expression' also implements 'assignment_expression'. */
+conditional_expression:
-/* K&R ???, C90 ???, C99 6.5.5 to 6.5.17, C11 ??? */
+	  conditional_expression T_ASTERISK conditional_expression {
 expression:
 	  expression T_ASTERISK expression {
 		$$ = build(MULT, $1, $3);
+	  }
-	| expression T_MULTIPLICATIVE expression {
+	| conditional_expression T_MULTIPLICATIVE conditional_expression {
 		$$ = build($2, $1, $3);
+	  }
-	| expression T_ADDITIVE expression {
+	| conditional_expression T_ADDITIVE conditional_expression {
 		$$ = build($2, $1, $3);
+	  }
-	| expression T_SHIFT expression {
+	| conditional_expression T_SHIFT conditional_expression {
 		$$ = build($2, $1, $3);
+	  }
-	| expression T_RELATIONAL expression {
+	| conditional_expression T_RELATIONAL conditional_expression {
 		$$ = build($2, $1, $3);
+	  }
-	| expression T_EQUALITY expression {
+	| conditional_expression T_EQUALITY conditional_expression {
 		$$ = build($2, $1, $3);
+	  }
-	| expression T_AMPER expression {
+	| conditional_expression T_AMPER conditional_expression {
 		$$ = build(BITAND, $1, $3);
+	  }
-	| expression T_BITXOR expression {
+	| conditional_expression T_BITXOR conditional_expression {
 		$$ = build(BITXOR, $1, $3);
+	  }
-	| expression T_BITOR expression {
+	| conditional_expression T_BITOR conditional_expression {
 		$$ = build(BITOR, $1, $3);
+	  }
-	| expression T_LOGAND expression {
+	| conditional_expression T_LOGAND conditional_expression {
 		$$ = build(LOGAND, $1, $3);
+	  }
-	| expression T_LOGOR expression {
+	| conditional_expression T_LOGOR conditional_expression {
 		$$ = build(LOGOR, $1, $3);
+	  }
-	| expression T_QUEST expression T_COLON expression {
+	| conditional_expression T_QUEST conditional_expression
 	    T_COLON conditional_expression {
 		$$ = build(QUEST, $1, build(COLON, $3, $5));
+	  }
-	| expression T_ASSIGN expression {
+	| cast_expression;
 /* K&R ???, C90 ???, C99 6.5.16, C11 6.5.16 */
 assignment_expression:
 	  conditional_expression
 	| assignment_expression T_ASSIGN conditional_expression {
 		$$ = build(ASSIGN, $1, $3);
+	  }
-	| expression T_OPASSIGN expression {
+	| assignment_expression T_OPASSIGN conditional_expression {
 		$$ = build($2, $1, $3);
+	  }
 	| expression T_COMMA expression {
 		$$ = build(COMMA, $1, $3);
 	| cast_expression
+	;
-/* K&R ???, C90 ???, C99 6.5.16, C11 ??? */
+/* K&R ???, C90 ???, C99 6.5.17, C11 6.5.17 */
-assignment_expression:
+expression:
-	  expression %prec T_ASSIGN
+	  assignment_expression
 	| expression T_COMMA assignment_expression {
 		$$ = build(COMMA, $1, $3);
+	  }
+	;
 constant_expr_list_opt:		/* helper for gcc_attribute */
 	  /* empty */
 	| constant_expr_list
+	;
 constant_expr_list:		/* helper for gcc_attribute */
 	  constant_expr
 	| constant_expr_list T_COMMA constant_expr
+	;
 constant_expr:			/* C99 6.6 */
-	  expression %prec T_ASSIGN
+	  conditional_expression
+	;
 declaration:			/* C99 6.7 */
 	  begin_type_declmods end_type T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else {
 			/* empty declaration */
 			warning(2);
+		}
+	  }
 	| begin_type_declmods end_type notype_init_declarators T_SEMI
 @@ -1496,27 +1500,27 @@ parameter_declaration:
 	 */
 	| begin_type_declaration_specifiers end_type type_param_declarator {
 		$$ = declare_argument($3, false);
+	  }
 	| begin_type_declmods end_type abstract_declarator {
 		$$ = declare_argument($3, false);
+	  }
 	| begin_type_declaration_specifiers end_type abstract_declarator {
 		$$ = declare_argument($3, false);
+	  }
+	;
 initializer:			/* C99 6.7.8 "Initialization" */
-	  expression %prec T_COMMA {
+	  assignment_expression {
 		init_expr($1);
+	  }
 	| init_lbrace init_rbrace {
 		/* XXX: Empty braces are not covered by C99 6.7.8. */
+	  }
 	| init_lbrace initializer_list comma_opt init_rbrace
 	| error
+	;
 initializer_list:		/* C99 6.7.8 "Initialization" */
 	  initializer_list_item
 	| initializer_list T_COMMA initializer_list_item
+	;

 @@ -1,31 +1,30 @@
-/*	$NetBSD: expr_precedence.c,v 1.1 2021/07/15 17:09:08 rillig Exp $	*/
+/*	$NetBSD: expr_precedence.c,v 1.2 2021/07/15 17:20:58 rillig Exp $	*/
 # 3 "expr_precedence.c"
 /*
  * Tests for the precedence among operators.
  */
 int var;
 /*
  * An initializer needs an assignment-expression; the comma must be
  * interpreted as a separator, not an operator.
  */
 /* expect+1: error: syntax error '4' [249] */
 int init_error = 3, 4;
 /* expect+1: error: non-constant initializer [177] */
 int init_syntactically_ok = var = 1 ? 2 : 3;
 /*
  * The arguments of __attribute__ must be constant-expression, as assignments
  * don't make sense at that point.
  */
 void __attribute__((format(printf,
     /* expect+2: error: 'var' undefined [99] */ /* XXX: why? */
-    /* XXX: allow only constant-expression, not assignment-expression */
+    /* expect+1: syntax error '=' [249] */
     var = 1,
     /* Syntactically ok, must be a constant expression though. */
     /* expect+1: error: 'var' undefined [99] */
     var > 0 ? 2 : 1)))
 my_printf(const char *, ...);

 @@ -1,4 +1,4 @@
 expr_precedence.c(15): error: syntax error '4' [249]
 expr_precedence.c(18): error: non-constant initializer [177]
 expr_precedence.c(27): error: 'var' undefined [99]
-expr_precedence.c(30): error: 'var' undefined [99]
+expr_precedence.c(27): error: syntax error '=' [249]