 @@ -1,54 +1,47 @@
-/* $NetBSD: opt_bacc.c,v 1.11 2023/05/11 18:13:55 rillig Exp $ */
+/* $NetBSD: opt_bacc.c,v 1.12 2023/05/20 10:09:03 rillig Exp $ */
 /*
  * Tests for the options '-bacc' and '-nbacc' ("blank line around conditional
  * compilation").
+ *
  * The option '-bacc' forces a blank line around every conditional compilation
  * block.  For example, in front of every #ifdef and after every #endif.
  * Other blank lines surrounding such blocks are swallowed.
+ *
- * The option '-nbacc' TODO.
+ * The option '-nbacc' leaves the vertical spacing as-is.
  */
 /* Example code without surrounding blank lines. */
 //indent input
 int		a;
 #if 0
 int		b;
 #endif
 int		c;
 //indent end
 /*
  * XXX: As of 2021-11-19, the option -bacc has no effect on declarations since
  * process_type resets out.blank_line_before unconditionally.
  */
 //indent run -bacc
 int		a;
 /* $ FIXME: expecting a blank line here */
 #if 0
 int		b;
 #endif
 /* $ FIXME: expecting a blank line here */
 int		c;
 //indent end
-/*
+/* The option '-nbacc' does not remove anything. */
  * With '-nbacc' the code is unchanged since there are no blank lines to
  * remove.
  */
 //indent run-equals-input -nbacc
 /* Example code containing blank lines. */
 //indent input
 int		space_a;
 #if 0
 int		space_b;
 #endif
 @@ -70,33 +63,33 @@ os_name(void)
+{
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 	return "BSD";
 #else
 	return "unknown";
 #endif
+}
 //indent end
 //indent run -bacc
 const char *
 os_name(void)
+{
 /* $ FIXME: expecting a blank line here. */
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 	return "BSD";
 #else
 	return "unknown";
 #endif
 /* $ FIXME: expecting a blank line here. */
+}
 //indent end
 //indent run-equals-input -nbacc
 /*
  * Test nested preprocessor directives.
  */
 //indent input
 #if outer
 #if inner
 int decl;
 @@ -112,16 +105,26 @@ int decl;
 /*
  * Test nested preprocessor directives that are interleaved with declarations.
  */
 //indent input
 #ifdef outer
 int outer_above;
 #ifdef inner
 int inner;
 #endif
 int outer_below;
 #endif
 //indent end
-//indent run-equals-input -di0 -bacc
+//indent run -di0 -bacc
 #ifdef outer
 int outer_above;
 #ifdef inner
 int inner;
 #endif
 int outer_below;
 #endif
 //indent end
 //indent run-equals-input -di0 -nbacc

 @@ -1,14 +1,14 @@
-/*	$NetBSD: debug.c,v 1.15 2023/05/20 02:47:35 rillig Exp $	*/
+/*	$NetBSD: debug.c,v 1.16 2023/05/20 10:09:02 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.15 2023/05/20 02:47:35 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.16 2023/05/20 10:09:02 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;
 @@ -107,26 +107,32 @@ static const char *const declaration_nam
 static const char *const in_enum_name[] = {
 	"no",
 	"enum",
 	"type",
 	"brace",
 };
 const char *const paren_level_cast_name[] = {
 	"(unknown cast)",
 	"(maybe cast)",
 	"(no cast)",
 };
 static const char *const line_kind_name[] = {
 	"other",
 	"#if",
 	"#endif",
 };
 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);
+}
 void
 debug_println(const char *fmt, ...)
 @@ -310,26 +316,29 @@ debug_parser_state(lexer_symbol lsym)
 	debug_ps_int(decl_ind);
 	debug_ps_bool(tabs_to_var);
 	debug_ps_bool(in_stmt_or_decl);
 	debug_ps_bool(in_stmt_cont);
 	debug_ps_bool(is_case_label);
 	debug_ps_bool(seen_case);
 	// The debug output for the parser symbols is done in 'parse' instead.
 	debug_ps_enum(spaced_expr_psym, psym_name);
 	debug_ps_int(quest_level);
 	debug_ps_enum(line_kind, line_kind_name);
 	debug_ps_enum(prev_line_kind, line_kind_name);
 	prev_ps = ps;
+}
 void
 debug_parse_stack(const char *situation)
+{
 	printf("parse stack %s:", situation);
 	for (int i = 1; i <= ps.tos; ++i)
 		printf(" %s %d", psym_name[ps.s_sym[i]], ps.s_ind_level[i]);
 	if (ps.tos == 0)
 		printf(" empty");
 	printf("\n");
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.296 2023/05/20 02:47:35 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.297 2023/05/20 10:09:02 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.296 2023/05/20 02:47:35 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.297 2023/05/20 10:09:02 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 = {
 @@ -965,39 +965,41 @@ process_preprocessing(void)
 	substring dir;
 	dir.s = lab.st + 1;
 	while (dir.s < end && ch_isblank(*dir.s))
 		dir.s++;
 	dir.e = dir.s;
 	while (dir.e < end && ch_isalpha(*dir.e))
 		dir.e++;
 	if (substring_starts_with(dir, "if")) {	/* also ifdef, ifndef */
 		if ((size_t)ifdef_level < array_length(state_stack))
 			state_stack[ifdef_level++] = ps;
 		else
 			diag(1, "#if stack overflow");
 		ps.line_kind = lk_if;
 	} else if (substring_starts_with(dir, "el")) {	/* else, elif */
 		if (ifdef_level <= 0)
 			diag(1, dir.s[2] == 'i'
 			    ? "Unmatched #elif" : "Unmatched #else");
 		else
 			ps = state_stack[ifdef_level - 1];
 	} else if (substring_equals(dir, "endif")) {
 		if (ifdef_level <= 0)
 			diag(1, "Unmatched #endif");
 		else
 			ifdef_level--;
 		ps.line_kind = lk_endif;
 	} else {
 		if (!substring_equals(dir, "pragma") &&
 		    !substring_equals(dir, "error") &&
 		    !substring_equals(dir, "line") &&
 		    !substring_equals(dir, "undef") &&
 		    !substring_equals(dir, "define") &&
 		    !substring_equals(dir, "include")) {
 			diag(1, "Unrecognized cpp directive \"%.*s\"",
 			    (int)(dir.e - dir.s), dir.s);
 			return;
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.h,v 1.152 2023/05/20 02:47:35 rillig Exp $	*/
+/*	$NetBSD: indent.h,v 1.153 2023/05/20 10:09:02 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Jens Schweikhardt
  * 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
 @@ -384,26 +384,34 @@ extern struct parser_state {
 	bool force_nl;		/* whether the next token is forced to go to a
 				 * new line; used after 'if (expr)' and in
 				 * similar situations; tokens like '{' may
 				 * ignore this */
 	enum declaration {
 		decl_no,	/* no declaration anywhere nearby */
 		decl_begin,	/* collecting tokens of a declaration */
 		decl_end,	/* finished a declaration */
 	} declaration;
 	bool blank_line_after_decl;
 	enum line_kind {
 		lk_other,
 		lk_if,		/* #if, #ifdef, #ifndef */
 		lk_endif,	/* #endif */
 	} line_kind;		/* kind of the current line, is reset to
 				 * lk_other at the beginning of each line */
 	enum line_kind prev_line_kind;
 	/* Comments */
 	bool curr_col_1;	/* whether the current token started in column
 				 * 1 of the original input */
 	bool next_col_1;
 } ps;
 #define array_length(array) (sizeof(array) / sizeof((array)[0]))
 #ifdef debug
 void debug_printf(const char *, ...) __printflike(1, 2);
 void debug_println(const char *, ...) __printflike(1, 2);
 @@ -426,27 +434,26 @@ extern const char *const paren_level_cas
 void register_typename(const char *);
 int compute_code_indent(void);
 int compute_label_indent(void);
 int ind_add(int, const char *, size_t);
 void inp_skip(void);
 char inp_next(void);
 void clear_indent_off_text(void);
 lexer_symbol lexi(void);
 void diag(int, const char *, ...) __printflike(2, 3);
 void output_line(void);
 void output_line_ff(void);
 void inp_read_line(void);
 void parse(parser_symbol);
 void process_comment(void);
 void set_option(const char *, const char *);
 void load_profile_files(const char *);
 void *nonnull(void *);
 void buf_add_char(struct buffer *, char);
 void buf_add_chars(struct buffer *, const char *, size_t);
 static inline bool
 ch_isalnum(char ch)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.178 2023/05/18 05:33:27 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.179 2023/05/20 10:09:02 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  * 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,36 +28,38 @@
  * 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: io.c,v 1.178 2023/05/18 05:33:27 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.179 2023/05/20 10:09:02 rillig Exp $");
 #include <stdio.h>
 #include <string.h>
 #include "indent.h"
 struct buffer inp;
-static struct buffer indent_off_text;
+static struct buffer indent_off_text;	/* text from between 'INDENT OFF' and
 					 * 'INDENT ON', both inclusive */
 static unsigned wrote_newlines = 2;	/* 0 in the middle of a line, 1 after
 					 * a single '\n', > 1 means there were
 					 * (n - 1) blank lines above */
 static int paren_indent;
 void
 inp_skip(void)
+{
 	inp.st++;
 	if ((size_t)(inp.st - inp.mem) >= inp.len)
 		inp_read_line();
+}
 char
 inp_next(void)
 @@ -82,62 +84,90 @@ inp_read_next_line(FILE *f)
+			}
 			had_eof = true;
 			break;
+		}
 		if (ch != '\0')
 			buf_add_char(&inp, (char)ch);
 		if (ch == '\n')
 			break;
+	}
+}
 static void
-output_char(char ch)
+output_newline(void)
+{
-	fputc(ch, output);
+	fputc('\n', output);
-	debug_vis_range("output_char '", &ch, 1, "'\n");
+	debug_println("output_newline");
 	wrote_newlines++;
+}
 static void
 output_range(const char *s, size_t len)
+{
 	fwrite(s, 1, len, output);
 	debug_vis_range("output_range \"", s, len, "\"\n");
 	for (size_t i = 0; i < len; i++)
 		wrote_newlines = s[i] == '\n' ? wrote_newlines + 1 : 0;
+}
 static int
 output_indent(int old_ind, int new_ind)
+{
 	int ind = old_ind;
 	if (opt.use_tabs) {
 		int tabsize = opt.tabsize;
 		int n = new_ind / tabsize - ind / tabsize;
 		if (n > 0)
 			ind -= ind % tabsize;
 		for (int i = 0; i < n; i++) {
 			fputc('\t', output);
 			ind += tabsize;
 			wrote_newlines = 0;
+		}
+	}
-	for (; ind < new_ind; ind++)
+	for (; ind < new_ind; ind++) {
 		fputc(' ', output);
 		wrote_newlines = 0;
+	}
 	debug_println("output_indent %d", ind);
 	return ind;
+}
 static void
 maybe_output_blank_line(void)
+{
 	bool want_blank_line = false;
 	if (ps.blank_line_after_decl && ps.declaration == decl_no) {
 		ps.blank_line_after_decl = false;
 		want_blank_line = true;
+	}
 	if (opt.blanklines_around_conditional_compilation) {
 		if (ps.prev_line_kind != lk_if && ps.line_kind == lk_if)
 			want_blank_line = true;
 		if (ps.prev_line_kind == lk_endif && ps.line_kind != lk_endif)
 			want_blank_line = true;
+	}
 	if (want_blank_line && wrote_newlines < 2
 	    && (lab.len > 0 || code.len > 0 || com.len > 0))
 		output_newline();
+}
 static int
 output_line_label(void)
+{
 	int ind;
 	while (lab.len > 0 && ch_isblank(lab.mem[lab.len - 1]))
 		lab.len--;
 	ind = output_indent(0, compute_label_indent());
 	output_range(lab.st, lab.len);
 	ind = ind_add(ind, lab.st, lab.len);
 	ps.is_case_label = false;
 @@ -180,27 +210,27 @@ output_line_comment(int ind)
 	for (; target_ind < 0; p++) {
 		if (*p == ' ')
 			target_ind++;
 		else if (*p == '\t')
 			target_ind = next_tab(target_ind);
 		else {
 			target_ind = 0;
 			break;
+		}
+	}
 	/* if comment can't fit on this line, put it on the next line */
 	if (ind > target_ind) {
-		output_char('\n');
+		output_newline();
 		ind = 0;
+	}
 	while (com.mem + com.len > p && ch_isspace(com.mem[com.len - 1]))
 		com.len--;
 	(void)output_indent(ind, target_ind);
 	output_range(p, com.len - (size_t)(p - com.mem));
 	ps.comment_delta = ps.n_comment_delta;
+}
 /*
 @@ -208,52 +238,48 @@ output_line_comment(int ind)
  * the label, the code and the comment.
+ *
  * Comments are written directly, bypassing this function.
  */
 void
 output_line(void)
+{
 	debug_printf("%s", __func__);
 	debug_buffers();
 	debug_println("");
 	ps.is_function_definition = false;
-	if (ps.blank_line_after_decl && ps.declaration == decl_no) {
+	maybe_output_blank_line();
 		ps.blank_line_after_decl = false;
 		if (lab.len > 0 || code.len > 0 || com.len > 0)
 			output_char('\n');
 	if (indent_enabled == indent_on) {
 		if (ps.ind_level == 0)
 			ps.in_stmt_cont = false;	/* this is a class A
 							 * kludge */
 		if (opt.blank_line_after_decl && ps.declaration == decl_end
 		    && ps.tos > 1) {
 			ps.declaration = decl_no;
 			ps.blank_line_after_decl = true;
+		}
 		int ind = 0;
 		if (lab.len > 0)
 			ind = output_line_label();
 		if (code.len > 0)
 			ind = output_line_code(ind);
 		if (com.len > 0)
 			output_line_comment(ind);
-		output_char('\n');
+		output_newline();
+	}
 	if (indent_enabled == indent_last_off_line) {
 		indent_enabled = indent_on;
 		output_range(indent_off_text.st, indent_off_text.len);
 		indent_off_text.len = 0;
+	}
 	ps.decl_on_line = ps.in_decl;	/* for proper comment indentation */
 	ps.in_stmt_cont = ps.in_stmt_or_decl && !ps.in_decl;
 	ps.decl_indent_done = false;
 	if (ps.extra_expr_indent == eei_last)
 		ps.extra_expr_indent = eei_no;
 @@ -262,26 +288,28 @@ output_line(void)
 	code.len = 0;
 	com.len = 0;
 	ps.ind_level = ps.ind_level_follow;
 	ps.line_start_nparen = ps.nparen;
 	if (ps.nparen > 0) {
 		/* TODO: explain what negative indentation means */
 		paren_indent = -1 - ps.paren[ps.nparen - 1].indent;
 		debug_println("paren_indent is now %d", paren_indent);
+	}
 	ps.want_blank = false;
 	ps.prev_line_kind = ps.line_kind;
 	ps.line_kind = lk_other;
+}
 static int
 compute_code_indent_lineup(int base_ind)
+{
 	int ind = paren_indent;
 	int overflow = ind_add(ind, code.st, code.len) - opt.max_line_length;
 	if (overflow < 0)
 		return ind;
 	if (ind_add(base_ind, code.st, code.len) < opt.max_line_length) {
 		ind -= overflow + 2;
 		if (ind > base_ind)