 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.36 2021/03/09 16:48:28 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.37 2021/03/09 18:28: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
 @@ -36,27 +36,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.36 2021/03/09 16:48:28 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.37 2021/03/09 18:28:10 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
 #endif
 #include <sys/param.h>
 #if HAVE_CAPSICUM
 #include <sys/capsicum.h>
 #include <capsicum_helpers.h>
 #endif
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -471,31 +471,31 @@ main(int argc, char **argv)
 			    fill_buffer();
 			if (*buf_ptr == '\n')
 			    break;
+		    }
 		    goto sw_buffer;
+		}
 		/* FALLTHROUGH */
 	    default:		/* it is the start of a normal statement */
+		{
 		    int remove_newlines;
 		    remove_newlines =
 			/* "} else" */
-			(type_code == sp_nparen && *token == 'e' &&
+			(type_code == keyword_do_else && *token == 'e' &&
 			    e_code != s_code && e_code[-1] == '}')
 			/* "else if" */
-			|| (type_code == sp_paren && *token == 'i' &&
+			|| (type_code == keyword_for_if_while &&
-			    last_else && opt.else_if);
+			    *token == 'i' && last_else && opt.else_if);
 		    if (remove_newlines)
 			force_nl = false;
 		    if (sc_end == NULL) {	/* ignore buffering if
 						 * comment wasn't saved up */
 			ps.search_brace = false;
 			goto check_type;
+		    }
 		    while (sc_end > save_com && isblank((unsigned char)sc_end[-1])) {
 			sc_end--;
+		    }
 		    if (opt.swallow_optional_blanklines ||
 			(!comment_buffered && remove_newlines)) {
 			force_nl = !remove_newlines;
 @@ -983,38 +983,38 @@ check_type:
 	    parse(rbrace);	/* let parser know about this */
 	    ps.search_brace = opt.cuddle_else && ps.p_stack[ps.tos] == ifhead
 		&& ps.il[ps.tos] >= ps.ind_level;
 	    if (ps.tos <= 1 && opt.blanklines_after_procs && ps.dec_nest <= 0)
 		postfix_blankline_requested = 1;
 	    break;
 	case swstmt:		/* got keyword "switch" */
 	    sp_sw = true;
 	    hd_type = swstmt;	/* keep this for when we have seen the
 				 * expression */
 	    goto copy_id;	/* go move the token into buffer */
-	case sp_paren:		/* token is if, while, for */
+	case keyword_for_if_while:
 	    sp_sw = true;	/* the interesting stuff is done after the
 				 * expression is scanned */
 	    hd_type = (*token == 'i' ? ifstmt :
 		       (*token == 'w' ? whilestmt : forstmt));
 	    /*
 	     * remember the type of header for later use by parser
 	     */
 	    goto copy_id;	/* copy the token into line */
-	case sp_nparen:		/* got else, do */
+	case keyword_do_else:
 	    ps.in_stmt = false;
 	    if (*token == 'e') {
 		if (e_code != s_code && (!opt.cuddle_else || e_code[-1] != '}')) {
 		    if (opt.verbose)
 			diag(0, "Line broken");
 		    dump_line();/* make sure this starts a line */
 		    ps.want_blank = false;
+		}
 		force_nl = true;/* also, following stuff must go onto new line */
 		last_else = 1;
 		parse(elselit);
+	    }
 	    else {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent_codes.h,v 1.8 2021/03/07 20:30:48 rillig Exp $	*/
+/*	$NetBSD: indent_codes.h,v 1.9 2021/03/09 18:28:10 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
 @@ -51,28 +51,28 @@ typedef enum token_type {
     question,			/* the '?' from a '?:' expression */
     casestmt,
     colon,
     semicolon,
     lbrace,
     rbrace,
     ident,
     comma,
     comment,
     swstmt,
     preesc,
     form_feed,
     decl,
-    sp_paren,
+    keyword_for_if_while,
-    sp_nparen,
+    keyword_do_else,
     ifstmt,
     whilestmt,
     forstmt,
     stmt,
     stmtl,
     elselit,
     dolit,
     dohead,
     ifhead,
     elsehead,
     period,
     strpfx,
     storage,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lexi.c,v 1.28 2021/03/09 16:48:28 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.29 2021/03/09 18:28:10 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
 @@ -36,27 +36,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)lexi.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.28 2021/03/09 16:48:28 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.29 2021/03/09 18:28:10 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
 #endif
 /*
  * Here we have the token scanner for indent.  It scans off one token and puts
  * it in the global variable "token".  It returns a code, indicating the type
  * of token scanned.
  */
 #include <assert.h>
 #include <err.h>
 @@ -197,27 +197,28 @@ compare_string_array(const void *key, co
+{
     return strcmp(key, *((const char *const *)elem));
+}
 #ifdef debug
 const char *
 token_type_name(token_type tk)
+{
     static const char *const name[] = {
 	"end_of_file", "newline", "lparen", "rparen", "unary_op",
 	"binary_op", "postop", "question", "casestmt", "colon",
 	"semicolon", "lbrace", "rbrace", "ident", "comma",
 	"comment", "swstmt", "preesc", "form_feed", "decl",
-	"sp_paren", "sp_nparen", "ifstmt", "whilestmt", "forstmt",
+	"keyword_for_if_while", "keyword_do_else",
 	"ifstmt", "whilestmt", "forstmt",
 	"stmt", "stmtl", "elselit", "dolit", "dohead",
 	"ifhead", "elsehead", "period", "strpfx", "storage",
 	"funcname", "type_def", "structure"
     };
     assert(0 <= tk && tk < sizeof name / sizeof name[0]);
     return name[tk];
+}
 static void
 print_buf(const char *name, const char *s, const char *e)
+{
 @@ -377,30 +378,30 @@ lexi(struct parser_state *state)
 		    state->cast_mask |= (1 << state->p_l_follow) & ~state->not_cast_mask;
+		}
 		if (state->last_token == period || state->last_token == unary_op) {
 		    state->keyword = rw_0;
 		    break;
+		}
 		if (p != NULL && p->rwcode == rw_struct_or_union_or_enum)
 		    return lexi_end(structure);
 		if (state->p_l_follow)
 		    break;
 		return lexi_end(decl);
 	    case rw_for_or_if_or_while:
-		return lexi_end(sp_paren);
+		return lexi_end(keyword_for_if_while);
 	    case rw_do_or_else:
-		return lexi_end(sp_nparen);
+		return lexi_end(keyword_do_else);
 	    case rw_storage_class:
 		return lexi_end(storage);
 	    case rw_typedef:
 		return lexi_end(type_def);
 	    default:		/* all others are treated like any other
 				 * identifier */
 		return lexi_end(ident);
 	    }			/* end of switch */
 	}			/* end of if (found_it) */
 	if (*buf_ptr == '(' && state->tos <= 1 && state->ind_level == 0 &&