 @@ -1,14 +1,14 @@
-/*	$NetBSD: fmt_decl.c,v 1.45 2023/05/23 06:43:19 rillig Exp $	*/
+/*	$NetBSD: fmt_decl.c,v 1.46 2023/05/23 16:53:57 rillig Exp $	*/
 /*
  * Tests for declarations of global variables, external functions, and local
  * variables.
+ *
  * See also:
  *	opt_di.c
  */
 /* See FreeBSD r303570 */
 /*
  * A type definition usually declares a single type, so there is no need to
 @@ -592,73 +592,65 @@ buffer_add(buffer *buf, char ch)
 static Token
 ToToken(bool cond)
+{
+}
 //indent end
 //indent run-equals-input -TToken
 /* Since lexi.c 1.153 from 2021-11-25. */
 //indent run-equals-input
 /*
- * Indent gets easily confused by unknown type names in struct declarations.
+ * Before indent.c 1.309 from 2023-05-23, indent easily got confused by unknown
  * type names in struct declarations, as a ';' did not finish a declaration.
  */
 //indent input
 typedef struct OpenDirs {
 	CachedDirList	list;
 	HashTable /* of CachedDirListNode */ table;
 }		OpenDirs;
 //indent end
 /* FIXME: The word 'HashTable' must not be aligned like a member name. */
 //indent run
 typedef struct OpenDirs {
 	CachedDirList	list;
 			HashTable /* of CachedDirListNode */ table;
 }		OpenDirs;
 //indent end
 //indent run-equals-input -THashTable
 //indent run-equals-input
 /*
- * Indent gets easily confused by unknown type names, even in declarations
+ * Before lexi.c 1.153 from 2021-11-25, indent easily got confused by unknown
- * that are syntactically unambiguous.
+ * type names, even in declarations that are syntactically unambiguous.
  */
 //indent input
 static CachedDir *dot = NULL;
 //indent end
 //indent run-equals-input -TCachedDir
 /* Since lexi.c 1.153 from 2021-11-25. */
 //indent run-equals-input
 /*
- * Before lexi.c 1.156 from 2021-11-25, indent easily got confused by unknown
+ * Before lexi.c 1.153 from 2021-11-25, indent easily got confused by unknown
- * type names in declarations and generated 'HashEntry * he' with an extra
+ * type names in declarations.
  * space.
  */
 //indent input
 static CachedDir *
 CachedDir_New(const char *name)
+{
+}
 //indent end
 /* Since lexi.c 1.153 from 2021-11-25. */
 //indent run-equals-input
 /*
  * Before lexi.c 1.156 from 2021-11-25, indent easily got confused by unknown
  * type names in declarations and generated 'CachedDir * dir' with an extra
  * space.
  */
 //indent input
 static CachedDir *
 CachedDir_Ref(CachedDir *dir)
+{
+}
 @@ -687,46 +679,45 @@ HashEntry_KeyEquals(const HashEntry *he,
 /*
  * Before lexi.c 1.156 from 2021-11-25, indent didn't notice that the two '*'
  * are in a declaration, instead it interpreted the first '*' as a binary
  * operator, therefore generating 'CachedDir * *var' with an extra space.
  */
 //indent input
 static void
 CachedDir_Assign(CachedDir **var, CachedDir *dir)
+{
+}
 //indent end
 //indent run-equals-input
 //indent run-equals-input -TCachedDir
 //indent run-equals-input
 /*
  * Before lexi.c 1.153 from 2021-11-25, all initializer expressions after the
- * first one were indented as if they would be statement continuations. This
+ * first one were indented as if they were statement continuations. This was
- * was because the token 'Shell' was identified as a word, not as a type name.
+ * caused by the token 'Shell' being identified as a word, not as a type name.
  */
 //indent input
 static Shell	shells[] = {
+	{
 		first,
 		second,
 	},
 };
 //indent end
 /* Since lexi.c 1.153 from 2021-11-25. */
 //indent run-equals-input
 /*
  * Before lexi.c 1.158 from 2021-11-25, indent easily got confused by function
  * attribute macros that followed the function declaration. Its primitive
  * heuristic between deciding between a function declaration and a function
  * definition only looked for ')' immediately followed by ',' or ';'. This was
  * sufficient for well-formatted code before 1990. With the addition of
  * function prototypes and GCC attributes, the situation became more
  * complicated, and it took indent 31 years to adapt to this new reality.
  */
 //indent input
 @@ -953,42 +944,26 @@ ch_isalnum(char ch)
+}
 static inline bool
 ch_isalpha(char ch)
+{
     return isalpha((unsigned char)ch) != 0;
+}
 //indent end
 //indent run-equals-input -i4 -di0
 //indent input
 struct {
 	void *list;
 	Table /* comment */ table;
 } var;
 //indent end
 //indent run -di0
 struct {
 	void *list;
 // $ FIXME: Wrong indentation, as 'Table' starts a new declaration.
 	     Table /* comment */ table;
 } var;
 //indent end
 //indent input
 void __printflike(1, 2)
 debug_printf(const char *fmt, ...)
+{
+}
 //indent end
 //indent run
 void
 // $ FIXME: No line break here.
 __printflike(1, 2)
 debug_printf(const char *fmt, ...)
+{
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: debug.c,v 1.22 2023/05/23 12:12:29 rillig Exp $	*/
+/*	$NetBSD: debug.c,v 1.23 2023/05/23 16:53:57 rillig Exp $	*/
 /*-
  * Copyright (c) 2023 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 FOUNDATION OR CONTRIBUTORS
  * 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>
-__RCSID("$NetBSD: debug.c,v 1.22 2023/05/23 12:12:29 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.23 2023/05/23 16:53:57 rillig Exp $");
 #include <stdarg.h>
 #include "indent.h"
 #ifdef debug
 /*-
  * false	show only the changes to the parser state
  * true		show unchanged parts of the parser state as well
  */
 static bool debug_full_parser_state = true;
 @@ -124,27 +124,27 @@ const char *const line_kind_name[] = {
 	"#endif",
 	"stmt head",
 	"}",
 	"block comment",
 };
 static const char *const decl_ptr_name[] = {
 	"start",
 	"word",
 	"word *",
 	"other",
 };
-static unsigned wrote_newlines;
+static unsigned wrote_newlines = 1;
 void
 debug_printf(const char *fmt, ...)
+{
 	FILE *f = output == stdout ? stderr : stdout;
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(f, fmt, ap);
 	va_end(ap);
 	wrote_newlines = 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.308 2023/05/23 12:12:29 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.309 2023/05/23 16:53:57 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1976 Board of Trustees of the University of Illinois.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  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
 @@ -28,27 +28,27 @@
  * ANY EXPRESS OR 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 REGENTS OR CONTRIBUTORS 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>
-__RCSID("$NetBSD: indent.c,v 1.308 2023/05/23 12:12:29 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.309 2023/05/23 16:53:57 rillig Exp $");
 #include <sys/param.h>
 #include <err.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "indent.h"
 struct options opt = {
 @@ -677,26 +677,27 @@ process_semicolon(void)
 		/* There were unbalanced parentheses in the statement. It is a
 		 * bit complicated, because the semicolon might be in a for
 		 * statement. */
 		diag(1, "Unbalanced parentheses");
 		ps.nparen = 0;
 		if (ps.spaced_expr_psym != psym_0) {
 			parse(ps.spaced_expr_psym);
 			ps.spaced_expr_psym = psym_0;
+		}
+	}
 	buf_add_char(&code, ';');
 	ps.want_blank = true;
 	ps.in_stmt_or_decl = ps.nparen > 0;
 	ps.decl_ind = 0;
 	if (ps.spaced_expr_psym == psym_0) {
 		parse(psym_0);	/* let parser know about end of stmt */
 		ps.force_nl = true;
+	}
+}
 static void
 process_lbrace(void)
+{
 	ps.in_stmt_or_decl = false;	/* don't indent the {} */
 	if (!ps.block_init)