Nicer output with '--dump-dfa-raw' and '--dump-nfa'.

diff --git a/re2c/src/dfa/dump.cc b/re2c/src/dfa/dump.cc
index e512833ed787d27d28067bf5f5790f0eaa6125be..fc531a44cc36c6a3770403734d02e62aa4fc4d4f 100644 (file)
--- a/re2c/src/dfa/dump.cc
+++ b/re2c/src/dfa/dump.cc
@@ -51,14 +51,12 @@ static void dump_history(const dfa_t &dfa, const tagtree_t &h, hidx_t i)
 
        const Tag &t = dfa.tags[h.tag(i)];
        const tagver_t v = h.elem(i);
-       if (v == TAGVER_BOTTOM) fprintf(stderr, "-");
        if (capture(t)) {
-               fprintf(stderr, "%u_", (uint32_t)t.ncap);
-       } else if (trailing(t)) {
-               fprintf(stderr, "*");
-       } else {
+               fprintf(stderr, "%u", (uint32_t)t.ncap);
+       } else if (!trailing(t)) {
                fprintf(stderr, "%s", t.name->c_str());
        }
+       fprintf(stderr, v == TAGVER_BOTTOM ? "↓" : "↑");
        fprintf(stderr, " ");
 }
 

diff --git a/re2c/src/nfa/dump.cc b/re2c/src/nfa/dump.cc
index 092e4b35697e8874c71667ef29f2ffd120881805..47e175aaa5d6da9a93aae14d9627989482f1bf94 100644 (file)
--- a/re2c/src/nfa/dump.cc
+++ b/re2c/src/nfa/dump.cc
@@ -49,10 +49,8 @@ void dump_nfa(const nfa_t &nfa)
                                const Tag &tag = nfa.tags[n->tag.info];
                                fprintf(stderr, "  n%u -> n%u [label=\"/", i, index(nfa, n->tag.out));
                                if (capture(tag)) {
-                                       fprintf(stderr, "%u_", (uint32_t)tag.ncap);
-                               } else if (trailing(tag)) {
-                                       fprintf(stderr, "%u", (uint32_t)n->rule);
-                               } else {
+                                       fprintf(stderr, "%u", (uint32_t)tag.ncap);
+                               } else if (!trailing(tag)) {
                                        fprintf(stderr, "%s", tag.name->c_str());
                                }
                                if (n->tag.bottom) {