[src/trunk]: src/usr.bin/xlint/lint1 lint: improve debug logging in initstack...

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

details:   https://anonhg.NetBSD.org/src/rev/af1330b7dbc2
branches:  trunk
changeset: 953736:af1330b7dbc2
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Mar 19 00:08:13 2021 +0000

description:
lint: improve debug logging in initstack_push

No functional change outside debug mode.

diffstat:

 usr.bin/xlint/lint1/init.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (73 lines):

diff -r eb9c479a2030 -r af1330b7dbc2 usr.bin/xlint/lint1/init.c
--- a/usr.bin/xlint/lint1/init.c        Thu Mar 18 23:45:20 2021 +0000
+++ b/usr.bin/xlint/lint1/init.c        Fri Mar 19 00:08:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init.c,v 1.99 2021/03/18 23:45:20 rillig Exp $ */
+/*     $NetBSD: init.c,v 1.100 2021/03/19 00:08:13 rillig Exp $        */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.99 2021/03/18 23:45:20 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.100 2021/03/19 00:08:13 rillig Exp $");
 #endif
 
 #include <stdlib.h>
@@ -584,17 +584,19 @@
                initerr = true;
                return false;
        }
+
        cnt = 0;
        debug_named_member();
        debug_step("lookup for '%s'%s",
            type_name(istk->i_type),
            istk->i_seen_named_member ? ", seen named member" : "");
+
        for (m = istk->i_type->t_str->sou_first_member;
             m != NULL; m = m->s_next) {
                if (m->s_bitfield && m->s_name == unnamed)
                        continue;
                if (namedmem != NULL) {
-                       debug_step("named lhs.member=%s, rhs.member=%s",
+                       debug_step("have member '%s', want member '%s'",
                            m->s_name, namedmem->n_name);
                        if (strcmp(m->s_name, namedmem->n_name) == 0) {
                                cnt++;
@@ -607,6 +609,7 @@
                        istk->i_subt = m->s_type;
                }
        }
+
        if (namedmem != NULL) {
                if (m == NULL) {
                        debug_step("pop struct");
@@ -658,7 +661,7 @@
        switch (istk->i_type->t_tspec) {
        case ARRAY:
                if (namedmem != NULL) {
-                       debug_step("ARRAY %s brace=%d",
+                       debug_step("pop array namedmem=%s brace=%d",
                            namedmem->n_name, istk->i_brace);
                        goto pop;
                }
@@ -677,14 +680,14 @@
                break;
        default:
                if (namedmem != NULL) {
-                       debug_step("pop");
+                       debug_step("pop scalar");
        pop:
                        inxt = initstk->i_enclosing;
                        free(istk);
                        initstk = inxt;
                        goto again;
                }
-               /* XXX: Why is this set to 1 unconditionally? */
+               /* The initialization stack now expects a single scalar. */
                istk->i_remaining = 1;
                break;
        }