 @@ -1,14 +1,14 @@
-/*	$NetBSD: fmt_decl.c,v 1.28 2021/11/25 18:20:21 rillig Exp $	*/
+/*	$NetBSD: fmt_decl.c,v 1.29 2021/11/25 18:36:30 rillig Exp $	*/
 /* $FreeBSD: head/usr.bin/indent/tests/declarations.0 334478 2018-06-01 09:41:15Z pstef $ */
 /*
  * Tests for declarations of global variables, external functions, and local
  * variables.
+ *
  * See also:
  *	opt_di.c
  */
 /* See FreeBSD r303570 */
 /*
 @@ -580,27 +580,37 @@ int	       *aaaaaaaaaaaaaaaaaaaaaaaaaaaa
  */
 #indent input
 void		buffer_add(buffer *, char);
 void		buffer_add(buffer *buf, char ch);
 void
 buffer_add(buffer *buf, char ch)
+{
 	*buf->e++ = ch;
+}
 #indent end
 /* Before lexi.c 1.156 from 2021-11-25, indent generated 'buffer * buf'. */
-#indent run-equals-input
+#indent run
 void		buffer_add(buffer *, char);
 /* $ FIXME: space after '*' */
 void		buffer_add(buffer * buf, char ch);
 void
 buffer_add(buffer *buf, char ch)
+{
 	*buf->e++ = ch;
+}
 #indent end
 /*
  * Indent gets easily confused by type names it does not know about.
  */
 #indent input
 static Token
 ToToken(bool cond)
+{
+}
 #indent end
 #indent run-equals-input -TToken
 @@ -783,43 +793,38 @@ number *var = a * b;
 void
 function(void)
+{
 	number *var = a * b;
+}
 #indent end
 #indent run-equals-input -di0
 /*
  * In declarations, most occurrences of '*' are pointer type derivations.
- * There are a few exceptions though.
+ * There are a few exceptions though. Some of these are hard to detect
  * without knowing which identifiers are type names.
  * Broken since lexi.c 1.156 from 2021-11-25.
  */
 #indent input
 char str[expr * expr];
 char str[expr**ptr];
 char str[*ptr**ptr];
 char str[sizeof(expr * expr)];
 char str[sizeof(int) * expr];
 char str[sizeof(*ptr)];
 char str[sizeof(type**)];
 char str[sizeof(**ptr)];
 #indent end
 #indent run -di0
-/* $ FIXME: The '*' must be a binary operator. */
+char str[expr * expr];
-char str[expr *expr];
+char str[expr * *ptr];
-/* $ FIXME: The first '*' must be a binary operator. */
+char str[*ptr * *ptr];
-char str[expr **ptr];
+char str[sizeof(expr * expr)];
-/* $ FIXME: The second '*' must be a binary operator. */
+char str[sizeof(int) * expr];
 char str[*ptr **ptr];
 /* $ FIXME: The '*' must be a binary operator. */
 char str[sizeof(expr *expr)];
 /* $ FIXME: The '*' must be a binary operator. */
 char str[sizeof(int) *expr];
 char str[sizeof(*ptr)];
-char str[sizeof(type **)];
+/* $ FIXME: should be 'type **' */
 char str[sizeof(type * *)];
 char str[sizeof(**ptr)];
 #indent end

 @@ -1,33 +1,28 @@
-/* $NetBSD: lsym_sizeof.c,v 1.2 2021/11/25 18:10:23 rillig Exp $ */
+/* $NetBSD: lsym_sizeof.c,v 1.3 2021/11/25 18:36:30 rillig Exp $ */
 /* $FreeBSD$ */
 /*
  * Tests for the token lsym_sizeof, which represents the keyword 'sizeof' for
  * determining the memory size of an object or a type.
+ *
  * See also:
  *	opt_bs.c		"blank after sizeof"
  *	C11 6.5.3.4		"The 'sizeof' and '_Alignof' operators"
  */
 #indent input
 // TODO: add input
 #indent end
 #indent run-equals-input
 /*
  * After 'sizeof', a type name in parentheses does not start a cast
  * expression.
  * Broken since lexi.c 1.156 from 2021-11-25.
  */
 #indent input
 char str[sizeof(int) * CHAR_BIT + 1];
 #indent end
-/* FIXME: The '*' must be a binary operator here. */
+#indent run-equals-input -di0
 #indent run -di0
 char str[sizeof(int) *CHAR_BIT + 1];
 #indent end

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lexi.c,v 1.162 2021/11/25 17:50:00 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.163 2021/11/25 18:36:30 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
 @@ -33,27 +33,27 @@
  * 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.
  */
 #if 0
 static char sccsid[] = "@(#)lexi.c	8.1 (Berkeley) 6/6/93";
 #endif
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.162 2021/11/25 17:50:00 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.163 2021/11/25 18:36:30 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "indent.h"
 /*
  * While inside lexi_alnum, this constant just marks a type, independently of
  * the parentheses level.
  */
 @@ -542,26 +542,37 @@ found_typename:
 	    if (ps.in_decl)
 		ps.in_parameter_declaration = true;
 	    return lsym_funcname;
+	}
     } else if (ps.p_l_follow == 0 && probably_typename()) {
 	ps.next_unary = true;
 	return lsym_type_outside_parentheses;
+    }
     return is_type ? lsym_type_in_parentheses : lsym_word;
+}
 static bool
 is_asterisk_unary(void)
+{
     if (ps.next_unary || ps.in_parameter_declaration)
 	return true;
     if (ps.prev_token == lsym_word ||
 	    ps.prev_token == lsym_rparen_or_rbracket)
 	return false;
     return ps.in_decl && ps.p_l_follow > 0;
+}
 static void
 lex_asterisk_unary(void)
+{
     while (inp_peek() == '*' || ch_isspace(inp_peek())) {
 	if (inp_peek() == '*')
 	    token_add_char('*');
 	inp_skip();
+    }
     if (ps.in_decl) {
 	const char *tp = inp_p(), *e = inp_line_end();
 	while (tp < e) {
 @@ -684,28 +695,27 @@ lexi(void)
     case '>':
     case '<':
     case '!':			/* ops like <, <<, <=, !=, etc */
 	if (inp_peek() == '>' || inp_peek() == '<' || inp_peek() == '=')
 	    *token.e++ = inp_next();
 	if (inp_peek() == '=')
 	    *token.e++ = inp_next();
 	lsym = ps.next_unary ? lsym_unary_op : lsym_binary_op;
 	next_unary = true;
 	break;
     case '*':
-	if (ps.next_unary || ps.in_parameter_declaration ||
+	if (is_asterisk_unary()) {
 		(ps.in_decl && ps.p_l_follow > 0)) {
 	    lex_asterisk_unary();
 	    lsym = lsym_unary_op;
 	    next_unary = true;
 	} else {
 	    if (inp_peek() == '=')
 		*token.e++ = inp_next();
 	    lsym = lsym_binary_op;
 	    next_unary = true;
+	}
 	break;
     default:
 	if (token.e[-1] == '/' && (inp_peek() == '*' || inp_peek() == '/')) {