From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Wed, 12 Jul 2017 16:39:03 +0000 (+0100)
Subject: Nicer output with '--dump-dfa-raw' and '--dump-nfa'.
X-Git-Tag: 1.0~39^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9697411674695f977f5759e65b8e4f75b430526;p=re2c

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

diff --git a/re2c/src/dfa/dump.cc b/re2c/src/dfa/dump.cc
index e512833e..fc531a44 100644
--- 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 ? "&darr;" : "&uarr;");
 	fprintf(stderr, " ");
 }
 
diff --git a/re2c/src/nfa/dump.cc b/re2c/src/nfa/dump.cc
index 092e4b35..47e175aa 100644
--- 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) {