Perform an early removeRedundancy call on graph

This allows sibling character classes to be merged together before graph
component splitting is done by calcComponents().

In particular, this transforms (A|a)(B|b)(C|c) into [Aa][Bb][Cc]
earlier.

diff --git a/src/nfagraph/ng.cpp b/src/nfagraph/ng.cpp
index 7f866a66a6709845a21c23984399bb7def5ed9a5..75884181958d34427cee803b6855543253dfe02d 100644 (file)
--- a/src/nfagraph/ng.cpp
+++ b/src/nfagraph/ng.cpp
@@ -402,6 +402,13 @@ bool NG::addGraph(NGWrapper &w) {
 
     dumpDotWrapper(w, "03_early", cc.grey);
 
+    // Perform a reduction pass to merge sibling character classes together.
+    if (cc.grey.performGraphSimplification) {
+        removeRedundancy(w, som);
+    }
+
+    dumpDotWrapper(w, "04_reduced", cc.grey);
+
     // If we've got some literals that span the graph from start to accept, we
     // can split them off into Rose from here.
     if (!som) {