[src/trunk]: src/usr.bin/indent indent: untangle complicated condition in pro...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7a804e9062f3
branches:  trunk
changeset: 1023978:7a804e9062f3
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Oct 05 21:55:22 2021 +0000

description:
indent: untangle complicated condition in probably_typedef

No functional change.

diffstat:

 usr.bin/indent/lexi.c |  22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 6d768e311b7c -r 7a804e9062f3 usr.bin/indent/lexi.c
--- a/usr.bin/indent/lexi.c     Tue Oct 05 21:05:12 2021 +0000
+++ b/usr.bin/indent/lexi.c     Tue Oct 05 21:55:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lexi.c,v 1.69 2021/10/05 06:15:24 rillig Exp $ */
+/*     $NetBSD: lexi.c,v 1.70 2021/10/05 21:55:22 rillig Exp $ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.69 2021/10/05 06:15:24 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.70 2021/10/05 21:55:22 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
@@ -330,11 +330,19 @@
 static bool
 probably_typedef(const struct parser_state *state)
 {
-    return state->p_l_follow == 0 && !state->block_init && !state->in_stmt &&
-       ((*buf_ptr == '*' && buf_ptr[1] != '=') ||
-       isalpha((unsigned char)*buf_ptr)) &&
-       (state->last_token == semicolon || state->last_token == lbrace ||
-       state->last_token == rbrace);
+    if (state->p_l_follow != 0)
+       return false;
+    if (state->block_init || state->in_stmt)
+       return false;
+    if (buf_ptr[0] == '*' && buf_ptr[1] != '=')
+       goto maybe;
+    if (isalpha((unsigned char)*buf_ptr))
+       goto maybe;
+    return false;
+maybe:
+    return state->last_token == semicolon ||
+          state->last_token == lbrace ||
+          state->last_token == rbrace;
 }
 
 static bool