 @@ -1,14 +1,14 @@
-/* $NetBSD: fmt_expr.c,v 1.7 2023/06/10 08:17:04 rillig Exp $ */
+/* $NetBSD: fmt_expr.c,v 1.8 2023/06/14 17:07:32 rillig Exp $ */
 /*
  * Tests for all kinds of expressions that are not directly related to unary
  * or binary operators.
+ *
  * See also:
  *	lsym_binary_op.c
  *	lsym_unary_op.c
  */
 //indent input
+{
 	// See lsym_offsetof.c.
 @@ -34,27 +34,27 @@
+{
 	int var = ({1});
 	int var = ({
 	});
 	int var = ({
 		int decl = 1;
 		stmt;
 	});
+}
 //indent end
 //indent run -di0
 error: Standard Input:7: Unbalanced parentheses
 warning: Standard Input:9: Extra ')'
+{
 	int var = ({1});
 	int var = ({
 		   });
 	int var = ({
 		   int decl = 1;
 		stmt;
 	});
+}
 exit 1
 error: Standard Input:7: Unbalanced parentheses
 warning: Standard Input:9: Extra ')'
 //indent end

 @@ -1,14 +1,14 @@
-/* $NetBSD: lsym_preprocessing.c,v 1.12 2023/06/14 10:29:52 rillig Exp $ */
+/* $NetBSD: lsym_preprocessing.c,v 1.13 2023/06/14 17:07:32 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.
 @@ -284,26 +284,26 @@ int before;
  * 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
 error: Standard Input:3: Unmatched #elifdef
 error: Standard Input:4: Unmatched #endif
 #else
 #elif 0
 #elifdef var
 #endif
 #unknown
 # 3 "file.c"
 exit 1
 error: Standard Input:1: Unmatched #else
 error: Standard Input:2: Unmatched #elif
 error: Standard Input:3: Unmatched #elifdef
 error: Standard Input:4: Unmatched #endif
 //indent end

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: psym_else.c,v 1.5 2023/06/10 17:35:41 rillig Exp $ */	1	/* $NetBSD: psym_else.c,v 1.6 2023/06/14 17:07:32 rillig Exp $ */
2		2
3	/*	3	/*
4	* Tests for the parser symbol psym_else, which represents the keyword 'else'	4	* Tests for the parser symbol psym_else, which represents the keyword 'else'
5	* that is being shifted on the parser stack.	5	* that is being shifted on the parser stack.
6	*	6	*
7	* This parser symbol never ends up on the stack itself.	7	* This parser symbol never ends up on the stack itself.
8	*/	8	*/
9		9
10	/*	10	/*
11	* When parsing nested incomplete 'if' statements, the problem of the	11	* When parsing nested incomplete 'if' statements, the problem of the
12	* 'dangling else' occurs. It is resolved by binding the 'else' to the	12	* 'dangling else' occurs. It is resolved by binding the 'else' to the
13	* innermost incomplete 'if' statement.	13	* innermost incomplete 'if' statement.
14	*	14	*
	@@ -70,19 +70,19 @@ function(void)		@@ -70,19 +70,19 @@ function(void)
70	else	70	else
71	(var = 3);	71	(var = 3);
72	}	72	}
73	//indent end	73	//indent end
74		74
75		75
76	//indent input	76	//indent input
77	{	77	{
78	else	78	else
79	}	79	}
80	//indent end	80	//indent end
81		81
82	//indent run	82	//indent run
83	error: Standard Input:2: Unmatched 'else'
84	{	83	{
85	else	84	else
86	}	85	}
87	exit 1	86	exit 1
		87	error: Standard Input:2: Unmatched 'else'
88	//indent end	88	//indent end

 @@ -1,14 +1,14 @@
--- $NetBSD: t_options.lua,v 1.4 2023/05/22 06:35:56 rillig Exp $
+-- $NetBSD: t_options.lua,v 1.5 2023/06/14 17:07:32 rillig Exp $
 --
 -- Copyright (c) 2023 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.
 --
 @@ -116,34 +116,37 @@ local function check_empty_lines_block(n
 		warn(lineno, ("expecting %d empty %s, got %d")
 		    :format(n, lines, max_empty_lines))
 	end
 end
 local function check_unused_input()
 	if unused_input_lineno ~= 0 then
 		warn(unused_input_lineno, "input is not used")
 	end
 end
 local function run_indent(inp, args)
 	local indent = os.getenv("INDENT") or "indent"
-	local cmd = indent .. " " .. args .. " 2>&1"
+	local cmd = indent .. " " .. args .. " 2>t_options.err"
 	local indent_in = assert(io.popen(cmd, "w"))
 	indent_in:write(inp)
 	local ok, kind, info = indent_in:close()
 	if not ok then
 		print(kind .. " " .. info)
 	end
 	for line in io.lines("t_options.err") do
 		print(line)
 	end
 end
 local function handle_empty_section(line)
 	if line == "" then
 		curr_empty_lines = curr_empty_lines + 1
 	else
 		if curr_empty_lines > max_empty_lines then
 			max_empty_lines = curr_empty_lines
 		end
 		if curr_empty_lines > 0 then
 			if prev_empty_lines > 1 then
 				warn(lineno - curr_empty_lines - 1,
 				    prev_empty_lines .. " empty lines a few "