 @@ -1,14 +1,14 @@
-/* $NetBSD: lsym_preprocessing.c,v 1.10 2023/05/13 08:33:39 rillig Exp $ */
+/* $NetBSD: lsym_preprocessing.c,v 1.11 2023/06/14 10:26:00 rillig Exp $ */
 /*
  * Tests for the token lsym_preprocessing, which represents a '#' that starts
  * a preprocessing line.
+ *
  * #define
  * #ifdef
  * #include
  * #line
  * #pragma
+ *
  * The whole preprocessing line is processed separately from the main source
  * code, without much tokenizing or parsing.
 @@ -246,13 +246,65 @@ int first_line;
 //indent end
 //indent run -di0
 int first_line;
 int before;
 #if 0
 /*INDENT OFF*/
 	int off;
 #else
 	int on;
 #endif
 	int after;
 //indent end
 /*
  * Before 2023-06-14, indent was limited to 5 levels of conditional compilation
  * directives.
  */
 //indent input
 #if 1
 #if 2
 #if 3
 #if 4
 #if 5
 #if 6
 #endif 6
 #endif 5
 #endif 4
 #endif 3
 #endif 2
 #endif 1
 //indent end
 //indent run-equals-input
 /*
  * Unrecognized and unmatched preprocessing directives are preserved.
  */
 //indent input
 #else
 #elif 0
 #elifdef var
 #endif
 #unknown
 # 3 "file.c"
 //indent end
 //indent run
 error: Standard Input:1: Unmatched #else
 error: Standard Input:2: Unmatched #elif
 // $ TODO: '#elifdef' instead of '#elif'
 error: Standard Input:3: Unmatched #elif
 error: Standard Input:4: Unmatched #endif
 #else
 #elif 0
 #elifdef var
 #endif
 #unknown
 # 3 "file.c"
 exit 1
 //indent end

 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: t_errors.sh,v 1.35 2023/06/10 17:35:41 rillig Exp $
+# $NetBSD: t_errors.sh,v 1.36 2023/06/14 10:26:00 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.
+#
 @@ -338,74 +338,26 @@ unexpected_closing_brace_decl_body()
+{
 	echo 'int i = 3};' > code.c
 	expect_error \
 	    'error: code.c:1: Statement nesting error' \
 	    code.c
 	# Despite the error message, the original file got overwritten with a
 	# best-effort rewrite of the code.
 	atf_check \
 	    -o 'inline:int		i = 3};\n' \
 	    cat code.c
+}
 atf_test_case 'preprocessing_overflow'
 preprocessing_overflow_body()
 	cat <<-\EOF > code.c
 		#if 1
 		#if 2
 		#if 3
 		#if 4
 		#if 5
 		#if 6
 		#endif 6
 		#endif 5
 		#endif 4
 		#endif 3
 		#endif 2
 		#endif 1
 		#endif too much
 	EOF
 	cat <<-\EOF > stderr.exp
 		error: code.c:6: #if stack overflow
 		error: code.c:12: Unmatched #endif
 		error: code.c:13: Unmatched #endif
 	EOF
 	atf_check -s 'exit:1' \
 	    -e 'file:stderr.exp' \
 	    "$indent" code.c
 atf_test_case 'preprocessing_unrecognized'
 preprocessing_unrecognized_body()
 	cat <<-\EOF > code.c
 		#unknown
 		# 3 "file.c"
 		#elif 3
 		#else
 	EOF
 	cat <<-\EOF > stderr.exp
 		error: code.c:3: Unmatched #elif
 		error: code.c:4: Unmatched #else
 	EOF
 	atf_check -s 'exit:1' \
 	    -e 'file:stderr.exp' \
 	    "$indent" code.c
 atf_test_case 'unbalanced_parentheses'
 unbalanced_parentheses_body()
+{
 	cat <<-\EOF > code.c
 		int var =
+		(
+		;
+		)
+		;
 	EOF
 	cat <<-\EOF > stderr.exp
 		error: code.c:3: Unbalanced parentheses
 		warning: code.c:4: Extra ')'
 @@ -534,21 +486,19 @@ atf_init_test_cases()
 	atf_add_test_case 'unterminated_comment_wrap'
 	atf_add_test_case 'unterminated_comment_nowrap'
 	atf_add_test_case 'unterminated_char_constant'
 	atf_add_test_case 'unterminated_string_literal'
 	atf_add_test_case 'in_place_wrong_backup'
 	atf_add_test_case 'argument_input_enoent'
 	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: indent.c,v 1.359 2023/06/14 08:36:51 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.360 2023/06/14 10:26:00 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.359 2023/06/14 08:36:51 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.360 2023/06/14 10:26:00 rillig Exp $");
 #include <sys/param.h>
 #include <err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "indent.h"
 struct options opt = {
 	.brace_same_line = true,
 	.comment_delimiter_on_blank_line = true,
 @@ -72,28 +72,31 @@ struct options opt = {
 struct parser_state ps;
 struct buffer token;
 struct buffer lab;
 struct buffer code;
 struct buffer com;
 bool found_err;
 bool had_eof;
 int line_no = 1;
-static int ifdef_level;
+static struct {
-static struct parser_state state_stack[5];
+	struct parser_state *item;
 	size_t len;
 	size_t cap;
 } ifdef;
 FILE *input;
 FILE *output;
 static const char *in_name = "Standard Input";
 static char backup_name[PATH_MAX];
 static const char *backup_suffix = ".BAK";
 void *
 nonnull(void *p)
+{
 	if (p == NULL)
 @@ -446,44 +449,46 @@ process_preprocessing(void)
 	if (lab.len > 0 || code.len > 0 || com.len > 0)
 		output_line();
 	read_preprocessing_line();
 	const char *dir = lab.s + 1, *line_end = lab.s + lab.len;
 	while (dir < line_end && ch_isblank(*dir))
 		dir++;
 	size_t dir_len = 0;
 	while (dir + dir_len < line_end && ch_isalpha(dir[dir_len]))
 		dir_len++;
 	if (dir_len >= 2 && memcmp(dir, "if", 2) == 0) {
-		if ((size_t)ifdef_level < array_length(state_stack))
+		if (ifdef.len >= ifdef.cap) {
-			state_stack[ifdef_level++] = ps;
+			ifdef.cap += 5;
-		else
+			ifdef.item = nonnull(realloc(ifdef.item,
-			diag(1, "#if stack overflow");
+				sizeof(ifdef.item[0]) * ifdef.cap));
+		}
 		ifdef.item[ifdef.len++] = ps;
 		out.line_kind = lk_if;
 	} else if (dir_len >= 2 && memcmp(dir, "el", 2) == 0) {
-		if (ifdef_level <= 0)
+		if (ifdef.len == 0)
 			diag(1, dir[2] == 'i'
 			    ? "Unmatched #elif" : "Unmatched #else");
 		else
-			ps = state_stack[ifdef_level - 1];
+			ps = ifdef.item[ifdef.len - 1];
 	} else if (dir_len == 5 && memcmp(dir, "endif", 5) == 0) {
-		if (ifdef_level <= 0)
+		if (ifdef.len == 0)
 			diag(1, "Unmatched #endif");
 		else
-			ifdef_level--;
+			ifdef.len--;
 		out.line_kind = lk_endif;
+	}
+}
 static void
 process_newline(void)
+{
 	if (ps.prev_lsym == lsym_comma
 	    && ps.nparen == 0 && !ps.in_init
 	    && !opt.break_after_comma && ps.break_after_comma
 	    && lab.len == 0	/* for preprocessing lines */
 	    && com.len == 0)
 		goto stay_in_line;