small [dead] code cleanup

christianparpart · Jun 8, 2018 · 860ecb4 · 860ecb4
1 parent bd42676
commit 860ecb4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 114 deletions.
diff --git a/src/klex/DFA.cc b/src/klex/DFA.cc
@@ -316,6 +316,23 @@ void DFA::setInitialState(State* s) {
   initialState_ = s;
 }
 
+void DFA::renumber() {
+  std::set<State*> registry;
+  renumber(initialState_, &registry);
+}
+
+void DFA::renumber(State* s, std::set<State*>* registry) {
+  StateId id = registry->size();
+  VERIFY_STATE_AVAILABILITY(id, *registry);
+  s->setId(id);
+  registry->insert(s);
+  for (const Edge& transition : s->transitions()) {
+    if (registry->find(transition.state) == registry->end()) {
+      renumber(transition.state, registry);
+    }
+  }
+}
+
 struct TransitionTable { // {{{
   struct Input {
     int configurationNumber;

diff --git a/src/klex/DFA.h b/src/klex/DFA.h
@@ -53,7 +53,10 @@ class DFA {
   //! Releases ownership of internal data structures to the callers responsibility.
   std::tuple<OwnedStateSet, State*> release();
 
+  void renumber();
+
  private:
+  void renumber(State* s, std::set<State*>* registry);
   State* createState(StateId expectedId);
   void setInitialState(State* state);
 

diff --git a/src/klex/fa.cc b/src/klex/fa.cc
diff --git a/src/klex/fa.h b/src/klex/fa.h
diff --git a/src/mklex.cc b/src/mklex.cc
@@ -117,7 +117,7 @@ int main(int argc, const char* argv[]) {
 
   if (std::string dotfile = flags.getString("fa-dot"); !dotfile.empty()) {
     if (flags.getBool("fa-renumber")) {
-      // TODO dfa.renumber();
+      dfa.renumber();
     }
     if (dotfile == "-") {
       std::cout << klex::dot({klex::DotGraph{dfa.initialState(), dfa.ownedStates(), "n", ""}}, "", true);