 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: t_errors.sh,v 1.34 2023/06/09 11:22:31 rillig Exp $
+# $NetBSD: t_errors.sh,v 1.35 2023/06/10 17:35:41 rillig Exp $
+#
 # Copyright (c) 2021 The NetBSD Foundation, Inc.
 # 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.
+#
 @@ -475,26 +475,52 @@ int
 f(void)
+{
 	if (0)
 		/*
 		 * 0123456789012345678901
 		 */;
+}
 EOF
 	atf_check -o 'file:expected.out' \
 	    "$indent" -l34 code.c -st
+}
 atf_test_case 'stack_overflow'
 stack_overflow_body()
+{
 	cat <<-EOF > code.c
 		{{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{
 		{{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{
 		{{{{{{{{{{ {{{{{{{{{{ {{{{{{{
 	EOF
 	atf_check \
 	    -s 'exit:1' \
 	    -e 'inline:error: code.c:3: Stuff missing from end of file\n' \
 	    "$indent" code.c
 	cat <<-EOF > code.c
 		{{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{
 		{{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{ {{{{{{{{{{
 		{{{{{{{{{{ {{{{{{{{{{ {{{{{{{ {
 	EOF
 	atf_check \
 	    -s 'exit:1' \
 	    -e 'inline:indent: Parser stack overflow\n' \
 	    "$indent" code.c
+}
 atf_init_test_cases()
+{
 	atf_add_test_case 'option_unknown'
 	atf_add_test_case 'option_bool_trailing_garbage'
 	atf_add_test_case 'option_int_missing_argument'
 	atf_add_test_case 'option_profile_not_found'
 	atf_add_test_case 'option_buffer_overflow'
 	atf_add_test_case 'option_typedefs_not_found'
 	atf_add_test_case 'option_special_missing_param'
 	atf_add_test_case 'option_tabsize_negative'
 	atf_add_test_case 'option_tabsize_zero'
 	atf_add_test_case 'option_tabsize_large'
 @@ -514,14 +540,15 @@ atf_init_test_cases()
 	atf_add_test_case 'argument_output_equals_input_name'
 	atf_add_test_case 'argument_output_equals_input_file'
 	atf_add_test_case 'argument_output_enoent'
 	atf_add_test_case 'argument_too_many'
 	atf_add_test_case 'unexpected_end_of_file'
 	atf_add_test_case 'unexpected_closing_brace_top_level'
 	atf_add_test_case 'unexpected_closing_brace_decl'
 	atf_add_test_case 'preprocessing_overflow'
 	atf_add_test_case 'preprocessing_unrecognized'
 	atf_add_test_case 'unbalanced_parentheses'
 	atf_add_test_case 'gcc_statement_expression'
 	atf_add_test_case 'crash_comment_after_controlling_expression'
 	atf_add_test_case 'comment_fits_in_one_line'
 	atf_add_test_case 'stack_overflow'
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.71 2023/06/10 16:43:56 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.72 2023/06/10 17:35:40 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,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: parse.c,v 1.71 2023/06/10 16:43:56 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.72 2023/06/10 17:35:40 rillig Exp $");
 #include <err.h>
 #include "indent.h"
 /*
  * Try to combine the statement on the top of the parse stack with the symbol
  * directly below it, replacing these two symbols with a single symbol.
  */
 static bool
 psyms_reduce_stmt(struct psym_stack *psyms)
+{
 	switch (psyms->sym[psyms->top - 1]) {
 @@ -91,37 +91,33 @@ psyms_reduce_stmt(struct psym_stack *psy
+}
 static int
 decl_level(void)
+{
 	int level = 0;
 	for (int i = ps.psyms.top - 1; i > 0; i--)
 		if (ps.psyms.sym[i] == psym_decl)
 			level++;
 	return level;
+}
 static void
-ps_push(parser_symbol psym)
+ps_push(parser_symbol psym, bool follow)
 	ps.psyms.sym[++ps.psyms.top] = psym;
 	ps.psyms.ind_level[ps.psyms.top] = ps.ind_level;
 static void
 ps_push_follow(parser_symbol psym)
+{
 	if (ps.psyms.top + 1 >= STACKSIZE)
 		errx(1, "Parser stack overflow");
 	ps.psyms.sym[++ps.psyms.top] = psym;
-	ps.psyms.ind_level[ps.psyms.top] = ps.ind_level_follow;
+	ps.psyms.ind_level[ps.psyms.top] =
 	    follow ? ps.ind_level_follow : ps.ind_level;
+}
 /*
  * Repeatedly try to reduce the top two symbols on the parse stack to a single
  * symbol, until no more reductions are possible.
  */
 static void
 psyms_reduce(struct psym_stack *psyms)
+{
 again:
 	if (psyms->sym[psyms->top] == psym_stmt && psyms_reduce_stmt(psyms))
 		goto again;
 	if (psyms->sym[psyms->top] == psym_while_expr &&
 @@ -170,94 +166,91 @@ parse(parser_symbol psym)
 		    || psyms->sym[psyms->top] == psym_stmt_list)
 			++ps.ind_level_follow;
 		else if (code.len == 0) {
 			/* It is part of a while, for, etc. */
 			--ps.ind_level;
 			/* for a switch, brace should be two levels out from
 			 * the code */
 			if (psyms->sym[psyms->top] == psym_switch_expr
 			    && opt.case_indent >= 1.0F)
 				--ps.ind_level;
+		}
-		ps_push(psym);
+		ps_push(psym, false);
-		ps_push_follow(psym_stmt);
+		ps_push(psym_stmt, true);
 		break;
 	case psym_rbrace:
 		/* stack should have <lbrace> <stmt> or <lbrace> <stmt_list> */
 		if (!(psyms->top > 0
 			&& is_lbrace(psyms->sym[psyms->top - 1]))) {
 			diag(1, "Statement nesting error");
 			break;
+		}
 		ps.ind_level = ps.ind_level_follow =
 		    psyms->ind_level[--psyms->top];
 		psyms->sym[psyms->top] = psym_stmt;
 		break;
 	case psym_decl:
 		if (psyms->sym[psyms->top] == psym_decl)
 			break;	/* only put one declaration onto stack */
 		ps.break_after_comma = true;
-		ps_push_follow(psym_decl);
+		ps_push(psym_decl, true);
 		if (opt.left_justify_decl)
 			ps.ind_level_follow = ps.ind_level = decl_level();
 		break;
 	case psym_stmt:
 		ps.break_after_comma = false;
-		ps_push(psym_stmt);
+		ps_push(psym_stmt, false);
 		break;
 	case psym_if_expr:
 		if (psyms->sym[psyms->top] == psym_if_expr_stmt_else
 		    && opt.else_if_in_same_line)
 			ps.ind_level_follow = psyms->ind_level[psyms->top--];
 		/* FALLTHROUGH */
 	case psym_do:
 	case psym_for_exprs:
 		ps.ind_level = ps.ind_level_follow++;
-		ps_push(psym);
+		ps_push(psym, false);
 		break;
 	case psym_else:
 		if (psyms->sym[psyms->top] != psym_if_expr_stmt) {
 			diag(1, "Unmatched 'else'");
 			break;
+		}
 		ps.ind_level = psyms->ind_level[psyms->top];
 		ps.ind_level_follow = ps.ind_level + 1;
 		psyms->sym[psyms->top] = psym_if_expr_stmt_else;
 		break;
 	case psym_switch_expr:
-		ps_push_follow(psym_switch_expr);
+		ps_push(psym_switch_expr, true);
 		ps.ind_level_follow += (int)opt.case_indent + 1;
 		break;
 	case psym_while_expr:
 		if (psyms->sym[psyms->top] == psym_do_stmt) {
 			ps.ind_level = ps.ind_level_follow =
 			    psyms->ind_level[psyms->top];
-			ps_push(psym_while_expr);
+			ps_push(psym_while_expr, false);
 		} else {
-			ps_push_follow(psym_while_expr);
+			ps_push(psym_while_expr, true);
 			++ps.ind_level_follow;
+		}
 		break;
 	default:
 		diag(1, "Unknown code to parser");
 		return;
+	}
 	if (psyms->top >= STACKSIZE - 1)
 		errx(1, "Parser stack overflow");
 	debug_psyms_stack("before reduction");
 	psyms_reduce(&ps.psyms);
 	debug_psyms_stack("after reduction");
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: opt_cli.c,v 1.6 2023/06/06 04:37:27 rillig Exp $ */
+/* $NetBSD: opt_cli.c,v 1.7 2023/06/10 17:35:41 rillig Exp $ */
 /*
  * Tests for the option '-cli' ("case label indentation"), which sets the
  * amount of indentation of a 'case' relative to the surrounding 'switch',
  * measured in indentation levels.
+ *
  * See also:
  *	lsym_case_label.c
  */
 //indent input
 void
 classify(int n)
 @@ -87,13 +87,64 @@ classify(int n)
 				  case 2:
 				  case 3:
 					print("prime");
 					break;
 				  case 4:
 					print("square");
 					break;
 				  default:
 					print("large");
 					break;
+	}
+}
 //indent end
 /*
  * Test the combination of left-aligned braces and a deep case indentation.
+ *
  * When the 'case' labels are that deeply indented, the distance between the
  * braces and the 'case' is between 1 and 2 indentation levels.
  */
 //indent input
+{
 switch (expr)
+{
 case 1:
+}
+}
 //indent end
 //indent run -br -cli3.25
+{
 	switch (expr) {
 				  case 1:
+	}
+}
 //indent end
 //indent run -bl -cli3.25
+{
 	switch (expr)
+			{
 				  case 1:
+			}
+}
 //indent end
 //indent run -bl -cli2.75
+{
 	switch (expr)
+		{
 			      case 1:
+		}
+}
 //indent end
 //indent run -bl -cli1.25
+{
 	switch (expr)
+	{
 		  case 1:
+	}
+}
 //indent end

 @@ -1,14 +1,14 @@
-/* $NetBSD: psym_else.c,v 1.4 2022/04/24 10:36:37 rillig Exp $ */
+/* $NetBSD: psym_else.c,v 1.5 2023/06/10 17:35:41 rillig Exp $ */
 /*
  * Tests for the parser symbol psym_else, which represents the keyword 'else'
  * that is being shifted on the parser stack.
+ *
  * This parser symbol never ends up on the stack itself.
  */
 /*
  * When parsing nested incomplete 'if' statements, the problem of the
  * 'dangling else' occurs.  It is resolved by binding the 'else' to the
  * innermost incomplete 'if' statement.
+ *
 @@ -61,13 +61,28 @@ function(void)
+}
 //indent end
 //indent run
 void
 function(void)
+{
 	if (var > 0)
 		var = 0;
 	else
 		(var = 3);
+}
 //indent end
 //indent input
+{
 	else
+}
 //indent end
 //indent run
 error: Standard Input:2: Unmatched 'else'
+{
 	else
+}
 exit 1
 //indent end