 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.495 2024/05/03 04:04:17 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.496 2024/05/09 11:08:07 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.495 2024/05/03 04:04:17 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.496 2024/05/09 11:08:07 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.
 @@ -130,26 +130,27 @@ is_either(const char *s, const char *a,
 	function_specifier y_function_specifier;
 	parameter_list y_parameter_list;
 	function_call *y_arguments;
 	type_t	*y_type;
 	tnode_t	*y_tnode;
 	range_t	y_range;
 	buffer	*y_string;
 	qual_ptr *y_qual_ptr;
 	bool	y_seen_statement;
 	struct generic_association *y_generic;
 	array_size y_array_size;
 	bool	y_in_system_header;
 	designation y_designation;
 	named_constant y_named_constant;
 };
 /* for Bison:
 %printer {
 	if (is_integer($$->v_tspec))
 		fprintf(yyo, "%lld", (long long)$$->u.integer);
 	else
 		fprintf(yyo, "%Lg", $$->u.floating);
 } <y_val>
 %printer { fprintf(yyo, "'%s'", $$ != NULL ? $$->sb_name : "<null>"); } <y_name>
 %printer {
 	bool indented = debug_push_indented(true);
 	debug_sym("", $$, "");
 @@ -189,26 +190,27 @@ is_either(const char *s, const char *a,
 %printer {
 	if ($$.dn_len == 0)
 		fprintf(yyo, "(empty)");
 	for (size_t i = 0; i < $$.dn_len; i++) {
 		const designator *dr = $$.dn_items + i;
 		if (dr->dr_kind == DK_MEMBER)
 			fprintf(yyo, ".%s", dr->dr_member->s_name);
 		else if (dr->dr_kind == DK_SUBSCRIPT)
 			fprintf(yyo, "[%zu]", dr->dr_subscript);
 		else
 			fprintf(yyo, "<scalar>");
+	}
 } <y_designation>
 %printer { fprintf(yyo, "%s", named_constant_name($$)); } <y_named_constant>
 */
 %token			T_LBRACE T_RBRACE T_LBRACK T_RBRACK T_LPAREN T_RPAREN
 %token			T_POINT T_ARROW
 %token			T_COMPLEMENT T_LOGNOT
 %token	<y_inc>		T_INCDEC
 %token			T_SIZEOF
 %token			T_BUILTIN_OFFSETOF
 %token			T_TYPEOF
 %token			T_EXTENSION
 %token			T_ALIGNAS
 %token			T_ALIGNOF
 %token			T_ASTERISK
 @@ -277,26 +279,27 @@ is_either(const char *s, const char *a,
 %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
 %token	<y_name>	T_NAME
 %token	<y_name>	T_TYPENAME
 %token	<y_val>		T_CON
 %token	<y_named_constant> T_NAMED_CONSTANT
 %token	<y_string>	T_STRING
 /* No type for program. */
 %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
 @@ -474,26 +477,45 @@ primary_expression:
 	T_NAME {
 		bool sys_name, sys_next;
 		sys_name = in_system_header;
 		if (yychar < 0)
 			yychar = yylex();
 		sys_next = in_system_header;
 		in_system_header = sys_name;
 		$$ = build_name(getsym($1), yychar == T_LPAREN);
 		in_system_header = sys_next;
+	}
 |	T_CON {
 		$$ = build_constant(gettyp($1->v_tspec), $1);
+	}
 |	T_NAMED_CONSTANT {
 		if ($1 == NC_NULLPTR) {
 			tnode_t *zero = expr_alloc_tnode();
 			zero->tn_op = CON;
 			zero->tn_type = gettyp(INT);
 			zero->u.value.v_tspec = INT;
 			type_t *void_ptr = block_derive_type(gettyp(VOID), PTR);
 			$$ = convert(CVT, 0, void_ptr, zero);
 			$$->tn_sys = zero->tn_sys;
 		} else {
 			tnode_t *nc = expr_alloc_tnode();
 			nc->tn_op = CON;
 			nc->tn_type = gettyp(BOOL);
 			nc->u.value.v_tspec = BOOL;
 			nc->u.value.u.integer = $1 == NC_TRUE ? 1 : 0;
 			$$ = nc;
+		}
+	}
 |	string {
 		$$ = build_string($1);
+	}
 |	T_LPAREN expression 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 {
 		set_sym_kind(SK_MEMBER);
 	} member_designator T_RPAREN {

 @@ -1,14 +1,14 @@
-/* $NetBSD: debug.c,v 1.77 2024/05/03 04:04:17 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.78 2024/05/09 11:08:07 rillig Exp $ */
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland Illig <rillig@NetBSD.org>.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.77 2024/05/03 04:04:17 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.78 2024/05/09 11:08:07 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 #ifdef DEBUG
 static int debug_indentation = 0;
 static bool did_indentation;
 @@ -351,26 +351,38 @@ type_qualifiers_string(type_qualifiers t
+}
 const char *
 function_specifier_name(function_specifier spec)
+{
 	static const char *const name[] = {
 		"inline",
 		"_Noreturn",
 	};
 	return name[spec];
+}
 const char *
 named_constant_name(named_constant nc)
+{
 	static const char *const name[] = {
 	    "false",
 	    "true",
 	    "nullptr",
 	};
 	return name[nc];
+}
 static void
 debug_word(bool flag, const char *name)
+{
 	if (flag)
 		debug_printf(" %s", name);
+}
 void
 debug_sym(const char *prefix, const sym_t *sym, const char *suffix)
+{
 	debug_printf("%s%s", prefix, sym->s_name);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs1.h,v 1.224 2024/05/03 04:04:18 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.225 2024/05/09 11:08:07 rillig Exp $	*/
 /*
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -126,26 +126,27 @@ void expr_free_all(void);
 memory_pool expr_save_memory(void);
 void expr_restore_memory(memory_pool);
 /*
  * debug.c
  */
 #ifdef DEBUG
 const char *decl_level_kind_name(decl_level_kind);
 const char *scl_name(scl_t);
 const char *symbol_kind_name(symbol_kind);
 const char *type_qualifiers_string(type_qualifiers);
 const char *function_specifier_name(function_specifier);
 const char *named_constant_name(named_constant);
 void debug_dcs(void);
 void debug_dcs_all(void);
 void debug_node(const tnode_t *);
 void debug_type(const type_t *);
 void debug_sym(const char *, const sym_t *, const char *);
 void debug_symtab(void);
 void debug_printf(const char *fmt, ...) __printflike(1, 2);
 void debug_skip_indent(void);
 void debug_indent_inc(void);
 void debug_indent_dec(void);
 bool debug_push_indented(bool);
 void debug_pop_indented(bool);
 void debug_enter_func(const char *);

 @@ -1,14 +1,14 @@
-/* $NetBSD: lex.c,v 1.224 2024/05/07 21:13:26 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.225 2024/05/09 11:08:07 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
 @@ -28,27 +28,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: lex.c,v 1.224 2024/05/07 21:13:26 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.225 2024/05/09 11:08:07 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 @@ -87,44 +87,45 @@ bool in_system_header;
 		(since) == 99 || (since) == 11, \
 		(since) == 23, \
 		(gcc) > 0, \
 		((deco) & 1) != 0, ((deco) & 2) != 0, ((deco) & 4) != 0, \
+	}
 #define kwdef_token(name, token,		since, gcc, deco) \
 	kwdef(name, token, {false},		since, gcc, deco)
 #define kwdef_sclass(name, sclass,		since, gcc, deco) \
 	kwdef(name, T_SCLASS, .u.kw_scl = (sclass), since, gcc, deco)
 #define kwdef_type(name, tspec,			since) \
 	kwdef(name, T_TYPE, .u.kw_tspec = (tspec), since, 0, 1)
 #define kwdef_tqual(name, tqual,		since, gcc, deco) \
 	kwdef(name, T_QUAL, .u.kw_tqual = {.tqual = true}, since, gcc, deco)
-#define kwdef_const(name, constant,		since, gcc, deco) \
+#define kwdef_const(name, named_constant,	since, gcc, deco) \
-	kwdef(name, T_CON, .u.kw_const = (constant), since, gcc, deco)
+	kwdef(name, T_NAMED_CONSTANT, \
 	    .u.kw_named_constant = (named_constant), since, gcc, deco)
 #define kwdef_keyword(name, token) \
 	kwdef(name, token, {false},		78, 0, 1)
 /* During initialization, these keywords are written to the symbol table. */
 static const struct keyword {
 	const	char kw_name[20];
 	int	kw_token;	/* token to be returned by yylex() */
 	union {
 		bool kw_dummy;
 		scl_t kw_scl;		/* if kw_token is T_SCLASS */
 		tspec_t kw_tspec;	/* if kw_token is T_TYPE or
 					 * T_STRUCT_OR_UNION */
 		type_qualifiers kw_tqual;	/* if kw_token is T_QUAL */
 		function_specifier kw_fs;	/* if kw_token is
 						 * T_FUNCTION_SPECIFIER */
-		named_constant kw_const;	/* if kw_token is T_CON */
+		named_constant kw_named_constant;
 	} u;
 	bool	kw_added_in_c90:1;
 	bool	kw_added_in_c99_or_c11:1;
 	bool	kw_added_in_c23:1;
 	bool	kw_gcc:1;	/* available in GCC mode */
 	bool	kw_plain:1;	/* 'name' */
 	bool	kw_leading:1;	/* '__name' */
 	bool	kw_both:1;	/* '__name__' */
 } keywords[] = {
 	// TODO: _Alignas is not available in C99.
 	kwdef_keyword(	"_Alignas",	T_ALIGNAS),
 	// TODO: _Alignof is not available in C99.
 	kwdef_keyword(	"_Alignof",	T_ALIGNOF),
 @@ -155,26 +156,27 @@ static const struct keyword {
 	kwdef_type(	"float",	FLOAT,			78),
 	kwdef_keyword(	"for",		T_FOR),
 	kwdef_token(	"_Generic",	T_GENERIC,		11,0,1),
 	kwdef_keyword(	"goto",		T_GOTO),
 	kwdef_keyword(	"if",		T_IF),
 	kwdef_token(	"__imag__",	T_IMAG,			78,1,1),
 	kwdef("inline",	T_FUNCTION_SPECIFIER, .u.kw_fs = FS_INLINE, 99,0,7),
 	kwdef_type(	"int",		INT,			78),
 #ifdef INT128_SIZE
 	kwdef_type(	"__int128_t",	INT128,			99),
 #endif
 	kwdef_type(	"long",		LONG,			78),
 	kwdef("_Noreturn", T_FUNCTION_SPECIFIER, .u.kw_fs = FS_NORETURN, 11,0,1),
 	kwdef_const(	"nullptr",	NC_NULLPTR,		23,0,1),
 	// XXX: __packed is GCC-specific.
 	kwdef_token(	"__packed",	T_PACKED,		78,0,1),
 	kwdef_token(	"__real__",	T_REAL,			78,1,1),
 	kwdef_sclass(	"register",	REG,			78,0,1),
 	kwdef_tqual(	"restrict",	tq_restrict,		99,0,7),
 	kwdef_keyword(	"return",	T_RETURN),
 	kwdef_type(	"short",	SHORT,			78),
 	kwdef(		"signed", T_TYPE, .u.kw_tspec = SIGNED,	90,0,3),
 	kwdef_keyword(	"sizeof",	T_SIZEOF),
 	kwdef_sclass(	"static",	STATIC,			78,0,1),
 	// XXX: _Static_assert was added in C11.
 	kwdef_keyword(	"_Static_assert",	T_STATIC_ASSERT),
 	kwdef("struct",	T_STRUCT_OR_UNION, .u.kw_tspec = STRUCT, 78,0,1),
 @@ -364,28 +366,28 @@ register_keyword(const struct keyword *k
 	sym_t *sym = block_zero_alloc(sizeof(*sym), "sym");
 	sym->s_name = name;
 	sym->s_keyword = kw;
 	int tok = kw->kw_token;
 	sym->u.s_keyword.sk_token = tok;
 	if (tok == T_TYPE || tok == T_STRUCT_OR_UNION)
 		sym->u.s_keyword.u.sk_tspec = kw->u.kw_tspec;
 	if (tok == T_SCLASS)
 		sym->s_scl = kw->u.kw_scl;
 	if (tok == T_QUAL)
 		sym->u.s_keyword.u.sk_type_qualifier = kw->u.kw_tqual;
 	if (tok == T_FUNCTION_SPECIFIER)
 		sym->u.s_keyword.u.function_specifier = kw->u.kw_fs;
-	if (tok == T_CON)
+	if (tok == T_NAMED_CONSTANT)
-		sym->u.s_keyword.u.constant = kw->u.kw_const;
+		sym->u.s_keyword.u.named_constant = kw->u.kw_named_constant;
 	symtab_add(sym);
+}
 static bool
 is_keyword_known(const struct keyword *kw)
+{
 	if (kw->kw_added_in_c23 && !allow_c23)
 		return false;
 	if ((kw->kw_added_in_c90 || kw->kw_added_in_c99_or_c11) && !allow_c90)
 		return false;
 @@ -445,32 +447,28 @@ lex_keyword(sym_t *sym)
+{
 	int tok = sym->u.s_keyword.sk_token;
 	if (tok == T_SCLASS)
 		yylval.y_scl = sym->s_scl;
 	if (tok == T_TYPE || tok == T_STRUCT_OR_UNION)
 		yylval.y_tspec = sym->u.s_keyword.u.sk_tspec;
 	if (tok == T_QUAL)
 		yylval.y_type_qualifiers =
 		    sym->u.s_keyword.u.sk_type_qualifier;
 	if (tok == T_FUNCTION_SPECIFIER)
 		yylval.y_function_specifier =
 		    sym->u.s_keyword.u.function_specifier;
-	if (tok == T_CON) {
+	if (tok == T_NAMED_CONSTANT)
-		val_t *v = xcalloc(1, sizeof(*v));
+		yylval.y_named_constant = sym->u.s_keyword.u.named_constant;
 		v->v_tspec = BOOL;
 		v->u.integer = sym->u.s_keyword.u.constant == NC_TRUE ? 1 : 0;
 		yylval.y_val = v;
 	return tok;
+}
 /*
  * Look up the definition of a name in the symbol table. This symbol must
  * either be a keyword or a symbol of the type required by sym_kind (label,
  * member, tag, ...).
  */
 extern int
 lex_name(const char *yytext, size_t yyleng)
+{
 	sym_t *sym = symtab_search(yytext);

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.225 2024/05/07 21:13:26 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.226 2024/05/09 11:08:07 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
 @@ -180,27 +180,27 @@ typedef enum {
 	ABSTRACT,		/* abstract symbol (sizeof, casts, unnamed
 				 * argument) */
 } scl_t;
 /* C23 6.7.4 */
 typedef enum {
 	FS_INLINE,		/* since C99 */
 	FS_NORETURN,		/* since C11 */
 } function_specifier;
 typedef enum {
 	NC_FALSE,		/* since C23 */
 	NC_TRUE,		/* since C23 */
-	// TODO: null_ptr
+	NC_NULLPTR,		/* since C23 */
 } named_constant;
 /* A type, variable, keyword; basically anything that has a name. */
 struct sym {
 	const char *s_name;
 	const char *s_rename;	/* renamed symbol's given name */
 	pos_t	s_def_pos;	/* position of last (prototype) definition,
 				 * prototype declaration, no-prototype-def.,
 				 * tentative definition or declaration, in this
 				 * order */
 	pos_t	s_set_pos;	/* position of first initialization */
 	pos_t	s_use_pos;	/* position of first use */
 	symbol_kind s_kind;
 @@ -230,27 +230,27 @@ struct sym {
 			struct_or_union *sm_containing_type;
 			unsigned int sm_offset_in_bits;
 		} s_member;
 		struct {
 			int sk_token;
 			union {
 				/* if T_TYPE or T_STRUCT_OR_UNION */
 				tspec_t sk_tspec;
 				/* if T_QUAL */
 				type_qualifiers sk_type_qualifier;
 				/* if T_FUNCTION_SPECIFIER */
 				function_specifier function_specifier;
 				/* if T_CON */
-				named_constant constant;
+				named_constant named_constant;
 			} u;
 		} s_keyword;
 		sym_t	*s_old_style_params;	/* parameters in an old-style
 						 * function definition */
 	} u;
 	sym_t	*s_symtab_next;	/* next symbol in the same symtab bucket */
 	sym_t	**s_symtab_ref;	/* pointer to s_symtab_next of the previous
 				 * symbol */
 	sym_t	*s_next;	/* next struct/union member, enumerator,
 				 * parameter */
 	sym_t	*s_level_next;	/* next symbol declared on the same level */
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: c23.c,v 1.10 2024/05/07 21:13:27 rillig Exp $	*/
+/*	$NetBSD: c23.c,v 1.11 2024/05/09 11:08:07 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
 @@ -18,26 +18,40 @@ bool_is_predefined_in_c23(void)
 	bool f = false;
 	return (t == true ? 20 : 0) + (f == false ? 3 : 0);
+}
 int
 c99_bool_is_still_valid_in_c23(void)
+{
 	_Bool t = 1;
 	_Bool f = 0;
 	return (t == 1 ? 20 : 0) + (f == 0 ? 3 : 0);
+}
 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;
+}
 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;
+}