 @@ -1,14 +1,14 @@
-/*	$NetBSD: c11_generic_expression.c,v 1.7 2021/07/11 20:34:05 rillig Exp $	*/
+/*	$NetBSD: c11_generic_expression.c,v 1.8 2021/07/11 20:37:21 rillig Exp $	*/
 # 3 "c11_generic_expression.c"
 /*
  * C99 added support for type-generic macros, but these were limited to the
  * header <tgmath.h>.  C11 made this feature generally available.
+ *
  * The generic selection is typically used with macros, but since lint1 works
  * on the preprocessed source, the test cases look a bit strange.
+ *
  * C99 6.5.1.1 "Generic selection"
  */
 /* lint1-extra-flags: -Ac11 */
 @@ -82,17 +82,15 @@ comma_expression(char first, double seco
  */
 /* ARGSUSED */
 int
 assignment_expression(int first, int second)
+{
 	return _Generic(first = second,
 	    int: second = first
 	);
+}
 int
 primary_expression(void)
+{
 	/*FIXME*//* expect+1: syntax error '(' [249] */
 	return _Generic(0, int: assignment_expression)(0, 0);
+}
 /* expect-1: falls off */

 @@ -1,8 +1,6 @@
 c11_generic_expression.c(29): warning: function classify_type_without_default expects to return value [214]
 c11_generic_expression.c(21): warning: argument 'var' unused in function 'classify_type_without_default' [231]
 c11_generic_expression.c(37): warning: argument 'var' unused in function 'classify_type_with_default' [231]
 c11_generic_expression.c(53): warning: argument 'c' unused in function 'classify_char' [231]
 c11_generic_expression.c(72): error: syntax error 'second' [249]
 c11_generic_expression.c(77): warning: function comma_expression falls off bottom without returning value [217]
 c11_generic_expression.c(96): error: syntax error '(' [249]
 c11_generic_expression.c(97): warning: function primary_expression falls off bottom without returning value [217]

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.317 2021/07/11 20:37:21 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.316 2021/07/11 20:25:54 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.317 2021/07/11 20:37:21 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.
 @@ -1712,51 +1712,51 @@ 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);
+	  }
 	| cast_expression
 	| 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);
+	  }
 	| T_CON {
 		$$ = expr_new_constant(gettyp($1->v_tspec), $1);
+	  }
 	| string {
 		$$ = new_string_node($1);
+	  }
 	| T_LPAREN expr T_RPAREN {
 		if ($2 != NULL)
 			$2->tn_parenthesized = true;
 		$$ = $2;
+	  }
 	| generic_selection
 	/* GCC primary-expression, see c_parser_postfix_expression */
 	| T_BUILTIN_OFFSETOF T_LPAREN type_name T_COMMA identifier T_RPAREN {
 		symtyp = FMEMBER;
 		$$ = build_offsetof($3, getsym($5));
+	  }
+	;
 postfix_expression:		/* C99 6.5.2 */
 	  primary_expression
 	| postfix_expression T_LBRACK expr T_RBRACK {
 		$$ = build(INDIR, build(PLUS, $1, $3), NULL);
+	  }
 	| postfix_expression T_LPAREN T_RPAREN {