From 5cd531a5e0804de5d72e843d9406724367c35294 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sun, 30 Jun 2019 21:35:55 -0400
Subject: [PATCH] Tests: Fix glib warning

---
 src/V3GraphDfa.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp
index d6b7d4811..af315adae 100644
--- a/src/V3GraphDfa.cpp
+++ b/src/V3GraphDfa.cpp
@@ -220,19 +220,23 @@ private:
 
         // Expand the nfasWithInput list to include epsilon states
         // reachable by those on nfasWithInput
-        for (DfaStates::iterator nfaIt=nfasWithInput.begin();
-             nfaIt!=nfasWithInput.end(); ++nfaIt) {
-            DfaVertex* nfaStatep = *nfaIt;
-            // Foreach epsilon-reachable (on this nfaStatep)
-            for (V3GraphEdge* nfaEdgep = nfaStatep->outBeginp();
-                 nfaEdgep; nfaEdgep=nfaEdgep->outNextp()) {
-                DfaEdge* cNfaEdgep = static_cast<DfaEdge*>(nfaEdgep);
-                if (cNfaEdgep->epsilon()) {
-                    DfaVertex* nextStatep = static_cast<DfaVertex*>(cNfaEdgep->top());
-                    if (unseenNfaThisStep(nextStatep)) {  // Not processed?
-                        nfasWithInput.push_back(nextStatep);
-                        nextStatep->user(m_step);
-                        UINFO(9,"      Epsilon Reachable "<<nextStatep<<endl);
+        {
+            DfaStates nfasTodo = nfasWithInput;
+            nfasWithInput.clear();  // Now the completed list
+            while (!nfasTodo.empty()) {
+                DfaVertex* nfaStatep = nfasTodo.front(); nfasTodo.pop_front();
+                nfasWithInput.push_back(nfaStatep);
+                // Foreach epsilon-reachable (on this nfaStatep)
+                for (V3GraphEdge* nfaEdgep = nfaStatep->outBeginp();
+                     nfaEdgep; nfaEdgep=nfaEdgep->outNextp()) {
+                    DfaEdge* cNfaEdgep = static_cast<DfaEdge*>(nfaEdgep);
+                    if (cNfaEdgep->epsilon()) {
+                        DfaVertex* nextStatep = static_cast<DfaVertex*>(cNfaEdgep->top());
+                        if (unseenNfaThisStep(nextStatep)) {  // Not processed?
+                            nfasTodo.push_back(nextStatep);
+                            nextStatep->user(m_step);
+                            UINFO(9,"      Epsilon Reachable "<<nextStatep<<endl);
+                        }
                     }
                 }
             }