 @@ -1,14 +1,14 @@
-/* $NetBSD: lsym_rparen_or_rbracket.c,v 1.6 2023/06/16 13:43:30 rillig Exp $ */
+/* $NetBSD: lsym_rparen_or_rbracket.c,v 1.7 2023/06/16 14:12:10 rillig Exp $ */
 /*
  * Tests for the token lsym_rparen_or_lbracket, which represents ')' or ']',
  * the counterparts for '(' and '['.
+ *
  * See also:
  *	lsym_lparen_or_lbracket.c
  */
 //indent input
 int var = (3);
 int cast = (int)3;
 int cast = (int)(3);
 @@ -56,22 +56,21 @@ int a = array[
 //indent end
 //indent input
+{
 	dcs_align((u_int)dcs);
 	mpools.pools[i] = (memory_pool){NULL, 0, 0};
 	list_add(l, (const char[3]){'-', (char)c, '\0'});
+}
 //indent end
 //indent run -ci4 -di0 -nlp
+{
-// $ FIXME: No space after cast.
+	dcs_align((u_int)dcs);
 	dcs_align((u_int) dcs);
 // $ FIXME: Don't add newlines.
 	mpools.pools[i] = (memory_pool) {
 		NULL, 0, 0
 	};
 	list_add(l, (const char[3]){'-', (char)c, '\0'});
+}
 //indent end

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.375 2023/06/16 12:55:57 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.376 2023/06/16 14:12:10 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.375 2023/06/16 12:55:57 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.376 2023/06/16 14:12:10 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,
 @@ -607,38 +607,47 @@ process_lparen(void)
 	enum paren_level_cast cast = cast_unknown;
 	if (ps.prev_lsym == lsym_offsetof
 	    || ps.prev_lsym == lsym_sizeof
 	    || ps.prev_lsym == lsym_for
 	    || ps.prev_lsym == lsym_if
 	    || ps.prev_lsym == lsym_switch
 	    || ps.prev_lsym == lsym_while
 	    || ps.line_has_func_def)
 		cast = cast_no;
 	paren_stack_push(&ps.paren, ind_add(0, code.s, code.len), cast);
+}
 static bool
 rparen_is_cast(bool paren_cast)
+{
 	if (ps.in_func_def_params)
 		return false;
 	if (ps.prev_lsym == lsym_unary_op)
 		return true;
 	if (ps.line_has_decl && !ps.in_init)
 		return false;
 	return paren_cast || ch_isalpha(inp_p[0]);
+}
 static void
 process_rparen(void)
+{
 	if (ps.paren.len == 0)
 		diag(0, "Extra '%c'", *token.s);
-	ps.prev_paren_was_cast = ps.paren.len > 0
+	bool paren_cast = ps.paren.len > 0
-	    && ps.paren.item[--ps.paren.len].cast == cast_maybe
+	    && ps.paren.item[--ps.paren.len].cast == cast_maybe;
-	    && !ps.in_func_def_params
+	ps.prev_paren_was_cast = rparen_is_cast(paren_cast);
 	    && !(ps.line_has_decl && !ps.in_init);
 	if (ps.prev_lsym == lsym_unary_op)
 		ps.prev_paren_was_cast = true;
 	if (ps.prev_paren_was_cast) {
 		ps.next_unary = true;
 		ps.want_blank = opt.space_after_cast;
 	} else
 		ps.want_blank = true;
 	if (code.len == 0)
 		ps.ind_paren_level = (int)ps.paren.len;
 	buf_add_buf(&code, &token);
 	if (ps.spaced_expr_psym != psym_0 && ps.paren.len == 0) {
 		parse(ps.spaced_expr_psym);