[groff] 27/28: [troff]: Tweak debugging output.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit acc2f84d6d89192d5bbc9b73452a56ca38072a8d
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Sun Mar 2 10:11:16 2025 -0600

    [troff]: Tweak debugging output.
    
    * src/roff/troff/mtsm.cpp (statem::display_state):
    * src/roff/troff/node.cpp (glyph_node::dump_node, node::dump_node)
      (composite_node::dump_node, dbreak_node::dump_node): Tweak format of
      debugging output.
---
 ChangeLog               |  7 +++++++
 src/roff/troff/mtsm.cpp | 16 ++++++++--------
 src/roff/troff/node.cpp | 34 ++++++++++++++++++----------------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 193150596..2f0a2e8af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-03-02  G. Branden Robinson <g.branden.robin...@gmail.com>
+
+       * src/roff/troff/mtsm.cpp (statem::display_state):
+       * src/roff/troff/node.cpp (glyph_node::dump_node)
+       (node::dump_node, composite_node::dump_node)
+       (dbreak_node::dump_node): Tweak format of debugging output.
+
 2025-03-02  G. Branden Robinson <g.branden.robin...@gmail.com>
 
        [troff]: Add new constructor for `node` type, permitting
diff --git a/src/roff/troff/mtsm.cpp b/src/roff/troff/mtsm.cpp
index ce8552dbf..7c8252168 100644
--- a/src/roff/troff/mtsm.cpp
+++ b/src/roff/troff/mtsm.cpp
@@ -469,26 +469,26 @@ void mtsm::flush(FILE *fp, statem *s, string tag_list)
 
 void statem::display_state()
 {
-  fprintf(stderr, " <state ");
+  fprintf(stderr, "\"<state");
   if (bool_values[MTSM_BR].is_known) {
     if (bool_values[MTSM_BR].value)
-      fprintf(stderr, "[br]");
+      fprintf(stderr, " [br]");
     else
-      fprintf(stderr, "[!br]");
+      fprintf(stderr, " [!br]");
   }
   if (bool_values[MTSM_EOL].is_known) {
     if (bool_values[MTSM_EOL].value)
-      fprintf(stderr, "[eol]");
+      fprintf(stderr, " [eol]");
     else
-      fprintf(stderr, "[!eol]");
+      fprintf(stderr, " [!eol]");
   }
   if (int_values[MTSM_SP].is_known) {
     if (int_values[MTSM_SP].value)
-      fprintf(stderr, "[sp %d]", int_values[MTSM_SP].value);
+      fprintf(stderr, " [sp %d]", int_values[MTSM_SP].value);
     else
-      fprintf(stderr, "[!sp]");
+      fprintf(stderr, " [!sp]");
   }
-  fprintf(stderr, ">");
+  fprintf(stderr, ">\"");
   fflush(stderr);
 }
 
diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
index 576bfbd5a..241459219 100644
--- a/src/roff/troff/node.cpp
+++ b/src/roff/troff/node.cpp
@@ -2220,12 +2220,13 @@ void glyph_node::dump_node()
     fprintf(stderr, "\"%c\"", c);
   else
     fprintf(stderr, "\"\\%s\"", ci->nm.contents());
-  fputs(", ", stderr);
   if (push_state)
-    fprintf(stderr, "push_state, ");
-  if (state)
+    fprintf(stderr, ", push_state");
+  if (state) {
+    fprintf(stderr, ", state: ");
     state->display_state();
-  fprintf(stderr, "diversion level: %d", div_nest_level);
+  }
+  fprintf(stderr, ", diversion level: %d", div_nest_level);
   fputs("}", stderr);
   fflush(stderr);
 }
@@ -2588,12 +2589,12 @@ units node::size()
 
 void node::dump_node()
 {
-  fprintf(stderr, "{type: %s, ", type());
+  fprintf(stderr, "{type: %s", type());
   if (push_state)
-    fputs("<push_state>, ", stderr);
+    fputs(", <push_state>", stderr);
   if (state)
-    fputs("<state>, ", stderr);
-  fprintf(stderr, "diversion level: %d", div_nest_level);
+    fputs(", <state>", stderr);
+  fprintf(stderr, ", diversion level: %d", div_nest_level);
   fputs("}", stderr);
   fflush(stderr);
 }
@@ -4988,12 +4989,13 @@ void composite_node::dump_node()
     fprintf(stderr, "\"%c\"", c);
   else
     fprintf(stderr, "\"\\%s\"", ci->nm.contents());
-  fputs(", ", stderr);
   if (push_state)
-    fprintf(stderr, "push_state, ");
-  if (state)
+    fprintf(stderr, ", push_state, ");
+  if (state) {
+    fprintf(stderr, ", state: ");
     state->display_state();
-  fprintf(stderr, "diversion level: %d", div_nest_level);
+  }
+  fprintf(stderr, ", diversion level: %d", div_nest_level);
   fputs("}", stderr);
   fflush(stderr);
 }
@@ -5871,12 +5873,12 @@ bool dbreak_node::is_tag()
 
 void dbreak_node::dump_node()
 {
-  fprintf(stderr, "{type: %s, ", type());
+  fprintf(stderr, "{type: %s", type());
   if (push_state)
-    fprintf(stderr, "<push_state>, ");
+    fprintf(stderr, ", <push_state>");
   if (state)
-    fprintf(stderr, "<state>, ");
-  fprintf(stderr, "diversion level: %d", div_nest_level);
+    fprintf(stderr, ", <state>");
+  fprintf(stderr, ", diversion level: %d", div_nest_level);
   if (none != 0 /* nullptr */) {
     fputs(", none: ", stderr);
     none->dump_node();

_______________________________________________
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit