 @@ -1,36 +1,35 @@
-/* $NetBSD: fmt_expr.c,v 1.8 2023/06/14 17:07:32 rillig Exp $ */
+/* $NetBSD: fmt_expr.c,v 1.9 2023/06/16 12:55:57 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.
 	malloc(offsetof(struct s, f) + 1);
 	// C99 compound literals use initializer braces.
 	println((const char[3]){'-', c, '\0'});
 	x = ((struct point){0, 0}).x;
 	for (ln = gnodes->first; ln != NULL; ln = ln->next)
-// $ FIXME: No space after the cast.
+		*(GNode **)Vector_Push(&vec) = ln->datum;
 		*(GNode **) Vector_Push(&vec) = ln->datum;
+}
 //indent end
 //indent run-equals-input
 /*
  * GCC statement expressions are not supported yet.
  */
 //indent input
+{
 	int var = ({1});
 	int var = ({

 @@ -1,14 +1,14 @@
-/* $NetBSD: lsym_unary_op.c,v 1.10 2023/06/08 21:18:54 rillig Exp $ */
+/* $NetBSD: lsym_unary_op.c,v 1.11 2023/06/16 12:55:57 rillig Exp $ */
 /*
  * Tests for the token lsym_unary_op, which represents a unary operator.
+ *
  * In an expression, a unary operator is written without blank next to its
  * argument.
+ *
  * In a type name, the "unary operator" '*' represents the derivation of a
  * pointer type.
+ *
  * See also:
  *	lsym_binary_op.c
  *	lsym_postfix_op.c
 @@ -75,27 +75,20 @@ unary_operators(void)
 	bool negated = !condition;
+}
 //indent end
 //indent run-equals-input -di0
 /*
  * Ensure that a '*' is not interpreted as unary operator in situations that
  * may look like a cast expression.
  */
 //indent input
+{
-sbuf_t *sb = *(sbuf_t **)sp;
+	sbuf_t *sb = *(sbuf_t **)sp;
 return (int)(a * (float)b);
 a = (2 * b == c);
 //indent end
 //indent run -di0
 // $ FIXME: Wrong spacing after the cast.
 	sbuf_t *sb = *(sbuf_t **) sp;
 	return (int)(a * (float)b);
 	a = (2 * b == c);
+}
 //indent end
 //indent run-equals-input -di0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.374 2023/06/16 12:30:45 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.375 2023/06/16 12:55:57 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.374 2023/06/16 12:30:45 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.375 2023/06/16 12:55:57 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,
 @@ -617,26 +617,28 @@ process_lparen(void)
 	paren_stack_push(&ps.paren, ind_add(0, code.s, code.len), cast);
+}
 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
 	    && ps.paren.item[--ps.paren.len].cast == cast_maybe
 	    && !ps.in_func_def_params
 	    && !(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);