 @@ -1,14 +1,14 @@
-/*	$NetBSD: debug.c,v 1.47 2023/06/10 09:31:41 rillig Exp $	*/
+/*	$NetBSD: debug.c,v 1.48 2023/06/10 11:01:58 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.47 2023/06/10 09:31:41 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.48 2023/06/10 11:01:58 rillig Exp $");
 #include <stdarg.h>
 #include <string.h>
 #include "indent.h"
 #ifdef debug
 static struct {
 	/*-
 	 * false	show only the changes to the parser state
 	 * true		show unchanged parts of the parser state as well
 	 */
 @@ -134,27 +134,27 @@ const char *const line_kind_name[] = {
 	"case/default",
 };
 static const char *const extra_expr_indent_name[] = {
 	"no",
 	"maybe",
 	"last",
 };
 static struct {
 	struct parser_state prev_ps;
 	bool ps_first;
 	const char *heading;
-    	unsigned wrote_newlines;
+	unsigned wrote_newlines;
 } state = {
 	.ps_first = true,
 	.wrote_newlines = 1,
 };
 void
 debug_printf(const char *fmt, ...)
+{
 	FILE *f = output == stdout ? stderr : stdout;
 	va_list ap;
 	if (state.heading != NULL) {
 		fprintf(f, "%s\n", state.heading);
 @@ -217,27 +217,27 @@ debug_print_buf(const char *name, const
+{
 	if (buf->len > 0) {
 		debug_printf(" %s ", name);
 		debug_vis_range("\"", buf->s, buf->len, "\"");
+	}
+}
 void
 debug_buffers(void)
+{
 	debug_print_buf("label", &lab);
 	debug_print_buf("code", &code);
 	debug_print_buf("comment", &com);
-	debug_println("");
+	debug_blank_line();
+}
 static void
 write_ps_bool(const char *name, bool prev, bool curr)
+{
 	if (curr != prev) {
 		char diff = " -+x"[(prev ? 1 : 0) + (curr ? 2 : 0)];
 		debug_println("        [%c]  ps.%s", diff, name);
 	} else if (config.full_parser_state || state.ps_first)
 		debug_println("        [%c]  ps.%s", curr ? 'x' : ' ', name);
+}
 static void
 @@ -277,53 +277,53 @@ debug_ps_paren(void)
+{
 	if (!config.full_parser_state && !ps_paren_has_changed()
 	    && !state.ps_first)
 		return;
 	debug_printf("             ps.paren:");
 	for (int i = 0; i < ps.nparen; i++) {
 		debug_printf(" %s%d",
 		    paren_level_cast_name[ps.paren[i].cast],
 		    ps.paren[i].indent);
+	}
 	if (ps.nparen == 0)
 		debug_printf(" none");
-	debug_println("");
+	debug_blank_line();
+}
 static bool
 ps_di_stack_has_changed(void)
+{
 	if (state.prev_ps.decl_level != ps.decl_level)
 		return true;
 	for (int i = 0; i < ps.decl_level; i++)
 		if (state.prev_ps.di_stack[i] != ps.di_stack[i])
 			return true;
 	return false;
+}
 static void
 debug_ps_di_stack(void)
+{
 	bool changed = ps_di_stack_has_changed();
 	if (!config.full_parser_state && !changed && !state.ps_first)
 		return;
 	debug_printf("     %s      ps.di_stack:", changed ? "->" : "  ");
 	for (int i = 0; i < ps.decl_level; i++)
 		debug_printf(" %d", ps.di_stack[i]);
 	if (ps.decl_level == 0)
 		debug_printf(" none");
-	debug_println("");
+	debug_blank_line();
+}
 #define debug_ps_bool(name) \
 	write_ps_bool(#name, state.prev_ps.name, ps.name)
 #define debug_ps_int(name) \
 	write_ps_int(#name, state.prev_ps.name, ps.name)
 #define debug_ps_enum(name, names) \
         write_ps_enum(#name, (names)[state.prev_ps.name], (names)[ps.name])
 void
 debug_parser_state(void)
+{
 	debug_blank_line();
 @@ -385,16 +385,16 @@ debug_parser_state(void)
 	state.prev_ps = ps;
 	state.ps_first = false;
+}
 void
 debug_parse_stack(const char *situation)
+{
 	debug_printf("parse stack %s:", situation);
 	const struct psym_stack *psyms = &ps.psyms;
 	for (int i = 0; i <= psyms->top; ++i)
 		debug_printf(" %d %s",
 		    psyms->ind_level[i], psym_name[psyms->sym[i]]);
-	debug_println("");
+	debug_blank_line();
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.213 2023/06/10 08:17:04 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.214 2023/06/10 11:01:58 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,42 +28,43 @@
  * 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.213 2023/06/10 08:17:04 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.214 2023/06/10 11:01:58 rillig Exp $");
 #include <stdio.h>
 #include "indent.h"
 struct buffer inp;
 const char *inp_p;
 struct output_state out;
 enum indent_enabled indent_enabled;
 static int out_ind;		/* width of the line that is being written */
-static unsigned wrote_newlines = 2;	/* 0 in the middle of a line, 1 after a
+static unsigned newlines = 2;	/* the total of written and buffered newlines;
-					 * single '\n', > 1 means there were (n
+				 * 0 in the middle of a line, 1 after a single
-					 * - 1) blank lines above */
+				 * finished line, anything > 1 are trailing
-static unsigned buffered_blank_lines;
+				 * blank lines */
 static unsigned buffered_newlines;	/* not yet written */
 static int paren_indent;
 static void
 inp_read_next_line(FILE *f)
+{
 	inp.len = 0;
 	for (;;) {
 		int ch = getc(f);
 		if (ch == EOF) {
 			if (indent_enabled == indent_on) {
 				buf_add_char(&inp, ' ');
 @@ -98,76 +99,76 @@ inp_skip(void)
 		inp_read_line();
+}
 char
 inp_next(void)
+{
 	char ch = inp_p[0];
 	inp_skip();
 	return ch;
+}
 static void
-write_newline(void)
+buffer_newline(void)
+{
-	buffered_blank_lines++;
+	buffered_newlines++;
-	wrote_newlines++;
+	newlines++;
 	out_ind = 0;
+}
 static void
-write_buffered_blank_lines(void)
+write_buffered_newlines(void)
+{
-	for (; buffered_blank_lines > 0; buffered_blank_lines--) {
+	for (; buffered_newlines > 0; buffered_newlines--) {
 		fputc('\n', output);
-		debug_println("output_newline");
+		debug_println("write_newline");
+	}
+}
 static void
 write_range(const char *s, size_t len)
+{
-	write_buffered_blank_lines();
+	write_buffered_newlines();
 	fwrite(s, 1, len, output);
-	debug_vis_range("output_range \"", s, len, "\"\n");
+	debug_vis_range("write_range \"", s, len, "\"\n");
 	for (size_t i = 0; i < len; i++)
-		wrote_newlines = s[i] == '\n' ? wrote_newlines + 1 : 0;
+		newlines = s[i] == '\n' ? newlines + 1 : 0;
 	out_ind = ind_add(out_ind, s, len);
+}
 static void
 write_indent(int new_ind)
+{
-	write_buffered_blank_lines();
+	write_buffered_newlines();
 	int ind = out_ind;
 	if (opt.use_tabs) {
 		int n = new_ind / opt.tabsize - ind / opt.tabsize;
 		if (n > 0) {
 			ind = ind - ind % opt.tabsize + n * opt.tabsize;
 			while (n-- > 0)
 				fputc('\t', output);
-			wrote_newlines = 0;
+			newlines = 0;
+		}
+	}
 	for (; ind < new_ind; ind++) {
 		fputc(' ', output);
-		wrote_newlines = 0;
+		newlines = 0;
+	}
-	debug_println("output_indent %d", ind);
+	debug_println("write_indent %d", ind);
 	out_ind = ind;
+}
 static bool
 want_blank_line(void)
+{
 	debug_println("%s: %s -> %s", __func__,
 	    line_kind_name[out.prev_line_kind], line_kind_name[out.line_kind]);
 	if (ps.blank_line_after_decl && ps.declaration == decl_no) {
 		ps.blank_line_after_decl = false;
 		return true;
+	}
 @@ -181,30 +182,30 @@ want_blank_line(void)
 	if (opt.blanklines_after_procs && out.prev_line_kind == lk_func_end
 	    && out.line_kind != lk_endif)
 		return true;
 	if (opt.blanklines_before_block_comments
 	    && out.line_kind == lk_block_comment)
 		return true;
 	return false;
+}
 static bool
 is_blank_line_optional(void)
+{
 	if (out.prev_line_kind == lk_stmt_head)
-		return wrote_newlines >= 1;
+		return newlines >= 1;
 	if (ps.psyms.top >= 2)
-		return wrote_newlines >= 2;
+		return newlines >= 2;
-	return wrote_newlines >= 3;
+	return newlines >= 3;
+}
 static int
 compute_case_label_indent(void)
+{
 	int i = ps.psyms.top;
 	while (i > 0 && ps.psyms.sym[i] != psym_switch_expr)
 		i--;
 	float case_ind = (float)ps.psyms.ind_level[i] + opt.case_indent;
 	return (int)(case_ind * (float)opt.indent_size);
+}
 int
 @@ -301,70 +302,72 @@ output_line_comment(void)
 	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 (out_ind > target_ind)
-		write_newline();
+		buffer_newline();
 	while (com.s + com.len > p && ch_isspace(com.s[com.len - 1]))
 		com.len--;
 	write_indent(target_ind);
 	write_range(p, com.len - (size_t)(p - com.s));
 	ps.comment_delta = ps.n_comment_delta;
+}
 static void
 output_line_indented(void)
+{
 	if (lab.len == 0 && code.len == 0 && com.len == 0)
 		out.line_kind = lk_blank;
-	if (want_blank_line() && wrote_newlines < 2
+	if (want_blank_line() && newlines < 2
 	    && out.line_kind != lk_blank)
-		write_newline();
+		buffer_newline();
 	/* This kludge aligns function definitions correctly. */
 	if (ps.ind_level == 0)
 		ps.in_stmt_cont = false;
 	if (opt.blank_line_after_decl && ps.declaration == decl_end
 	    && ps.psyms.top > 1) {
 		ps.declaration = decl_no;
 		ps.blank_line_after_decl = true;
+	}
 	if (opt.swallow_optional_blanklines
 	    && out.line_kind == lk_blank
 	    && is_blank_line_optional())
 		return;
 	if (lab.len > 0)
 		output_line_label();
 	if (code.len > 0)
 		output_line_code();
 	if (com.len > 0)
 		output_line_comment();
 	buffer_newline();
 	if (out.line_kind != lk_blank)
 		write_buffered_newlines();
 	write_newline();
 	out.prev_line_kind = out.line_kind;
+}
 /*
  * Write a line of formatted source to the output file. The line consists of
  * the label, the code and the comment.
  */
 void
 output_line(void)
+{
 	debug_blank_line();
 	debug_printf("%s", __func__);
 	debug_buffers();
 @@ -397,25 +400,20 @@ output_line(void)
 	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);
+	}
 	out.line_kind = lk_other;
+}
 void
 output_finish(void)
+{
-	if (lab.len > 0 || code.len > 0 || com.len > 0)
+	output_line();
-		output_line();
+	if (indent_enabled != indent_on) {
 	if (indent_enabled == indent_on) {
 		if (buffered_blank_lines > 1)
 			buffered_blank_lines = 1;
 		write_buffered_blank_lines();
 	} else {
 		indent_enabled = indent_last_off_line;
 		output_line();
+	}
 	fflush(output);
+}