 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.498 2024/05/09 20:22:20 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.499 2024/05/09 20:56:41 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)
-__RCSID("$NetBSD: cgram.y,v 1.498 2024/05/09 20:22:20 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.499 2024/05/09 20:56:41 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.
 @@ -296,52 +296,54 @@ is_either(const char *s, const char *a,
 %type	<y_sym>		identifier_sym
 %type	<y_name>	identifier
 %type	<y_string>	string
 %type	<y_tnode>	primary_expression
 %type	<y_designation>	member_designator
 %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_arguments>	argument_expression_list
 %type	<y_scl>		storage_class_specifiers
 %type	<y_tnode>	unary_expression
 %type	<y_tnode>	cast_expression
 %type	<y_tnode>	expression_opt
 %type	<y_tnode>	conditional_expression
 %type	<y_tnode>	assignment_expression
 %type	<y_tnode>	expression
 %type	<y_tnode>	constant_expression
 /* No type for declaration_or_error. */
 /* No type for declaration. */
 /* No type for begin_type_declaration_specifiers. */
 /* No type for begin_type_declmods. */
 /* No type for begin_type_specifier_qualifier_list. */
 /* No type for begin_type_specifier_qualifier_list_postfix. */
 %type	<y_type>	begin_type_typespec
 /* No type for begin_type_qualifier_list. */
 /* No type for declmod. */
 /* No type for type_attribute_list_opt. */
 /* No type for type_attribute_list. */
 /* No type for type_attribute_opt. */
 /* No type for type_attribute. */
 /* No type for begin_type. */
 /* No type for end_type. */
 /* No type for notype_init_declarator_list. */
 /* No type for type_init_declarator_list. */
 /* No type for notype_init_declarator. */
 /* No type for type_init_declarator. */
 %type	<y_scl>		storage_class_specifier
 %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_member_declaration_list
 %type	<y_sym>		member_declaration_list_with_rbrace
 %type	<y_sym>		member_declaration_list
 %type	<y_sym>		member_declaration
 %type	<y_sym>		notype_member_declarator_list
 %type	<y_sym>		type_member_declarator_list
 %type	<y_sym>		notype_member_declarator
 %type	<y_sym>		type_member_declarator
 %type	<y_type>	enum_specifier
 @@ -596,26 +598,39 @@ postfix_expression:
+	}
 	/* Rule 'compound_literal' from C99 6.5.2.5. */
 |	T_LPAREN type_name T_RPAREN {
 		sym_t *tmp = mktempsym($2);
 		begin_initialization(tmp);
 		cgram_declare(tmp, true, NULL);
 	} braced_initializer {
 		if (!allow_c99)
 			 /* compound literals are a C99/GCC extension */
 			 gnuism(319);
 		$$ = build_name(current_initsym(), false);
 		end_initialization();
+	}
 	/* Rule 'compound_literal' with storage classes from C23 6.5.3.6. */
 |	T_LPAREN storage_class_specifiers type_name T_RPAREN {
 		sym_t *tmp = mktempsym($3);
 		tmp->s_scl = $2;
 		begin_initialization(tmp);
 		cgram_declare(tmp, true, NULL);
 	} braced_initializer {
 		if (!allow_c99)
 			 /* compound literals are a C99/GCC extension */
 			 gnuism(319);
 		$$ = build_name(current_initsym(), false);
 		end_initialization();
+	}
 |	T_LPAREN compound_statement_lbrace {
 		begin_statement_expr();
 	} gcc_statement_expr_list {
 		do_statement_expr($4);
 	} compound_statement_rbrace T_RPAREN {
 		$$ = end_statement_expr();
+	}
+;
 /*
  * The inner part of a GCC statement-expression of the form ({ ... }).
+ *
  * https://gcc.gnu.org/onlinedocs/gcc/Statement-Exprs.html
 @@ -672,27 +687,34 @@ argument_expression_list:
 		$$ = expr_zero_alloc(sizeof(*$$), "function_call");
 		add_function_argument($$, $1);
+	}
 |	argument_expression_list T_COMMA assignment_expression {
 		$$ = $1;
 		add_function_argument($1, $3);
+	}
+;
 /* C23 6.5.3.6 */
 /* The rule 'compound_literal' is inlined into 'postfix_expression'. */
-/* TODO: Implement 'storage_class_specifiers' from C23 6.5.3.6. */
+/* C23 6.5.3.6 */
 storage_class_specifiers:
 	storage_class_specifier
 |	storage_class_specifiers storage_class_specifier {
 		// TODO C23: maybe merge multiple storage class specifiers
 		$$ = $1;
+	}
+;
 /* K&R 7.2, C90 ???, C99 6.5.3, C11 6.5.3, C23 6.5.4 */
 unary_expression:
 	postfix_expression
 |	T_INCDEC sys unary_expression {
 		$$ = build_unary($1 ? INCBEF : DECBEF, $2, $3);
+	}
 |	T_AMPER sys cast_expression {
 		$$ = build_unary(ADDR, $2, $3);
+	}
 |	T_ASTERISK sys cast_expression {
 		$$ = build_unary(INDIR, $2, $3);
+	}
 @@ -1038,27 +1060,30 @@ type_init_declarator:
+	}
 |	type_declarator asm_or_symbolrename_opt {
 		begin_initialization($1);
 		cgram_declare($1, true, $2);
 	} T_ASSIGN initializer {
 		check_size($1);
 		end_initialization();
+	}
+;
 /* TODO: Implement 'attribute_declaration' from C23 6.7.1. */
-/* TODO: Implement 'storage_class_specifier' from C23 6.7.2. */
+/* K&R ???, C90 ???, C99 ???, C11 ???, C23 6.7.2 */
 storage_class_specifier:
 	T_SCLASS
+;
 /* C99 6.7.2, C23 6.7.3.1 */
 type_specifier:
 	notype_type_specifier
 |	T_TYPENAME {
 		$$ = getsym($1)->s_type;
+	}
+;
 notype_type_specifier:		/* see C99 6.7.2 */
 	T_TYPE {
 		$$ = gettyp($1);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: c23.c,v 1.11 2024/05/09 11:08:07 rillig Exp $	*/
+/*	$NetBSD: c23.c,v 1.12 2024/05/09 20:56:41 rillig Exp $	*/
 # 3 "c23.c"
 // Tests for the option -Ac23, which allows features from C23 and all earlier
 // ISO standards, but none of the GNU extensions.
 //
 // See also:
 //	c11.c
 //	msg_353.c		for empty initializer braces
 /* lint1-flags: -Ac23 -w -X 351 */
 int
 @@ -32,26 +32,49 @@ bool
 null_pointer_constant(const char *p, double dbl)
+{
 	/* expect+1: error: operands of '!=' have incompatible types 'double' and 'pointer to void' [107] */
 	if (dbl != nullptr)
 		p++;
 	if (dbl > 0.0)
 		p++;
 	if (*p == '\0')
 		p = nullptr;
 	return p == nullptr;
+}
 void *
 storage_class_in_compound_literal(void)
+{
 	typedef struct node node;
 	struct node {
 		node *left;
 		int value;
 		node *right;
 	};
 	node *tree;
 	tree = &(static node){
 	    &(static node){
 		nullptr,
 ,
 		nullptr,
 	    },
 ,
 	    nullptr,
 	};
 	return tree->left;
+}
 int
 empty_initializer_braces(void)
+{
 	struct s {
 		int member;
 	} s;
 	// Empty initializer braces were introduced in C23.
 	s = (struct s){};
 	s = (struct s){s.member};
 	return s.member;
+}