[src/trunk]: src/usr.bin/indent indent: sync debug output with parser state

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

details:   https://anonhg.NetBSD.org/src/rev/d64e40b66ef0
branches:  trunk
changeset: 376236:d64e40b66ef0
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Jun 05 14:22:26 2023 +0000

description:
indent: sync debug output with parser state

diffstat:

 usr.bin/indent/debug.c  |  81 ++++++++++++++++++++++++++++--------------------
 usr.bin/indent/indent.h |   4 +-
 2 files changed, 49 insertions(+), 36 deletions(-)

diffs (155 lines):

diff -r c4e16161ee67 -r d64e40b66ef0 usr.bin/indent/debug.c
--- a/usr.bin/indent/debug.c    Mon Jun 05 13:59:54 2023 +0000
+++ b/usr.bin/indent/debug.c    Mon Jun 05 14:22:26 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: debug.c,v 1.34 2023/06/04 20:51:19 rillig Exp $        */
+/*     $NetBSD: debug.c,v 1.35 2023/06/05 14:22:26 rillig Exp $        */
 
 /*-
  * Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: debug.c,v 1.34 2023/06/04 20:51:19 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.35 2023/06/05 14:22:26 rillig Exp $");
 
 #include <stdarg.h>
 
@@ -129,6 +129,12 @@ const char *const line_kind_name[] = {
        "case/default",
 };
 
+static const char *const extra_expr_indent_name[] = {
+       "no",
+       "yes",
+       "last",
+};
+
 static const char *const decl_ptr_name[] = {
        "start",
        "word",
@@ -290,51 +296,58 @@ debug_parser_state(void)
        static struct parser_state prev_ps;
 
        debug_blank_line();
-       debug_println("           ps.prev_lsym = %s",
-           lsym_name[ps.prev_lsym]);
-       debug_ps_bool(curr_col_1);
-       debug_ps_bool(next_col_1);
+       debug_println("           ps.prev_lsym = %s", lsym_name[ps.prev_lsym]);
+
+       debug_println("token classification");
+       debug_ps_int(quest_level);
+       debug_ps_bool(is_function_definition);
+       debug_ps_bool(block_init);
+       debug_ps_int(block_init_level);
+       debug_ps_bool(init_or_struct);
+       debug_ps_bool(decl_on_line);
+       debug_ps_bool(in_stmt_or_decl);
+       debug_ps_bool(in_decl);
+       debug_ps_bool(in_func_def_params);
+       debug_ps_bool(seen_case);
+       debug_ps_enum(spaced_expr_psym, psym_name);
+       debug_ps_enum(lbrace_kind, psym_name);
+
+       debug_println("indentation of statements and declarations");
+       debug_ps_int(ind_level);
+       debug_ps_int(ind_level_follow);
+       debug_ps_bool(in_stmt_cont);
+       debug_ps_int(decl_level);
+       debug_ps_di_stack(&prev_ps);
+       debug_ps_bool(decl_indent_done);
+       debug_ps_int(decl_ind);
+       debug_ps_bool(tabs_to_var);
+       debug_ps_enum(extra_expr_indent, extra_expr_indent_name);
+
+       // The parser symbol stack is printed in debug_parse_stack instead.
+
+       debug_println("spacing inside a statement or declaration");
        debug_ps_bool(next_unary);
-       debug_ps_bool(is_function_definition);
        debug_ps_bool(want_blank);
-       debug_ps_bool(break_after_comma);
-       debug_ps_bool(force_nl);
        debug_ps_int(line_start_nparen);
        debug_ps_int(nparen);
        debug_ps_paren(&prev_ps);
+       debug_ps_enum(decl_ptr, decl_ptr_name);
 
+       debug_println("horizontal spacing for comments");
        debug_ps_int(comment_delta);
        debug_ps_int(n_comment_delta);
        debug_ps_int(com_ind);
 
-       debug_ps_bool(block_init);
-       debug_ps_int(block_init_level);
-       debug_ps_bool(init_or_struct);
-
-       debug_ps_int(ind_level);
-       debug_ps_int(ind_level_follow);
-
-       debug_ps_int(decl_level);
-       debug_ps_di_stack(&prev_ps);
-       debug_ps_bool(decl_on_line);
-       debug_ps_bool(in_decl);
+       debug_println("vertical spacing");
+       debug_ps_bool(break_after_comma);
+       debug_ps_bool(force_nl);
        debug_ps_enum(declaration, declaration_name);
        debug_ps_bool(blank_line_after_decl);
-       debug_ps_bool(in_func_def_params);
-       debug_ps_enum(lbrace_kind, psym_name);
-       debug_ps_enum(decl_ptr, decl_ptr_name);
-       debug_ps_bool(decl_indent_done);
-       debug_ps_int(decl_ind);
-       debug_ps_bool(tabs_to_var);
 
-       debug_ps_bool(in_stmt_or_decl);
-       debug_ps_bool(in_stmt_cont);
-       debug_ps_bool(seen_case);
+       debug_println("comments");
+       debug_ps_bool(curr_col_1);
+       debug_ps_bool(next_col_1);
 
-       // The debug output for the parser symbols is done in 'parse' instead.
-
-       debug_ps_enum(spaced_expr_psym, psym_name);
-       debug_ps_int(quest_level);
        debug_blank_line();
 
        prev_ps = ps;
@@ -345,7 +358,7 @@ debug_parse_stack(const char *situation)
 {
        printf("parse stack %s:", situation);
        for (int i = 0; i <= ps.tos; ++i)
-               printf(" %s %d", psym_name[ps.s_sym[i]], ps.s_ind_level[i]);
+               printf(" %d %s", ps.s_ind_level[i], psym_name[ps.s_sym[i]]);
        printf("\n");
 }
 #endif
diff -r c4e16161ee67 -r d64e40b66ef0 usr.bin/indent/indent.h
--- a/usr.bin/indent/indent.h   Mon Jun 05 13:59:54 2023 +0000
+++ b/usr.bin/indent/indent.h   Mon Jun 05 14:22:26 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: indent.h,v 1.174 2023/06/05 12:05:01 rillig Exp $      */
+/*     $NetBSD: indent.h,v 1.175 2023/06/05 14:22:26 rillig Exp $      */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -373,6 +373,7 @@ extern struct parser_state {
                                 * are currently open; used to indent the
                                 * remaining lines of the statement,
                                 * initializer or declaration */
+       paren_level_props paren[20];
        enum {
                dp_start,       /* the beginning of a declaration */
                dp_word,        /* seen a type name */
@@ -381,7 +382,6 @@ extern struct parser_state {
        } decl_ptr;             /* detects declarations like 'typename *x', to
                                 * prevent the '*' from being interpreted as a
                                 * binary operator */
-       paren_level_props paren[20];
 
        /* Horizontal spacing for comments */