 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.311 2021/07/11 18:22:02 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.312 2021/07/11 19:01:37 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.311 2021/07/11 18:22:02 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.312 2021/07/11 19:01:37 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.
 @@ -114,27 +114,27 @@ RESTORE_WARN_FLAGS(const char *file, siz
 #define save_warning_flags()	SAVE_WARN_FLAGS(__FILE__, __LINE__)
 #define restore_warning_flags()	RESTORE_WARN_FLAGS(__FILE__, __LINE__)
 /* unbind the anonymous struct members from the struct */
 static void
 anonymize(sym_t *s)
+{
 	for ( ; s != NULL; s = s->s_next)
 		s->s_styp = NULL;
+}
 %}
-%expect 168
+%expect 167
 %union {
 	val_t	*y_val;
 	sbuf_t	*y_name;
 	sym_t	*y_sym;
 	op_t	y_op;
 	scl_t	y_scl;
 	tspec_t	y_tspec;
 	tqual_t	y_tqual;
 	type_t	*y_type;
 	tnode_t	*y_tnode;
 	range_t	y_range;
 	strg_t	*y_string;
 @@ -247,26 +247,28 @@ anonymize(sym_t *s)
 %token			T_AT_PURE
 %token			T_AT_RETURNS_TWICE
 %token			T_AT_SECTION
 %token			T_AT_SENTINEL
 %token			T_AT_STRING
 %token			T_AT_TLS_MODEL
 %token			T_AT_TUNION
 %token			T_AT_UNUSED
 %token			T_AT_USED
 %token			T_AT_VISIBILITY
 %token			T_AT_WARN_UNUSED_RESULT
 %token			T_AT_WEAK
 %left	T_THEN
 %left	T_ELSE
 %left	T_COMMA
 %right	T_ASSIGN T_OPASSIGN
 %right	T_QUEST T_COLON
 %left	T_LOGOR
 %left	T_LOGAND
 %left	T_BITOR
 %left	T_BITXOR
 %left	T_AMPER
 %left	T_EQUALITY
 %left	T_RELATIONAL
 %left	T_SHIFT
 %left	T_ADDITIVE
 %left	T_ASTERISK T_MULTIPLICATIVE
 @@ -1476,27 +1478,27 @@ block_item:			/* C99 6.8.2 */
+	;
 expression_statement:		/* C99 6.8.3 */
 	  expr T_SEMI {
 		expr($1, false, false, false, false);
 		seen_fallthrough = false;
+	  }
 	| T_SEMI {
 		seen_fallthrough = false;
+	  }
+	;
 selection_statement:		/* C99 6.8.4 */
-	  if_without_else {
+	  if_without_else %prec T_THEN {
 		save_warning_flags();
 		if2();
 		if3(false);
+	  }
 	| if_without_else T_ELSE {
 		save_warning_flags();
 		if2();
 	  } statement {
 		clear_warning_flags();
 		if3(true);
+	  }
 	| if_without_else T_ELSE error {
 		clear_warning_flags();