better case_match command

1 files changed, 11 insertions, 5 deletions

diff --git a/src/parse/regex/dfa.rs b/src/parse/regex/dfa.rs
index 243176d..0a5c78d 100644
--- a/src/parse/regex/dfa.rs
+++ b/src/parse/regex/dfa.rs
@@ -34,7 +34,7 @@ impl fmt::Debug for DFA {
                 write!(f, "{chr:?} to {to}, ")?;
             }
 
-            write!(f, "default to {}", s.default_trans)?;
+            write!(f, "dfl to {}", s.default_trans)?;
             if s.accept {
                 write!(f, ", accept")?;
             }
@@ -58,14 +58,18 @@ impl DFA {
         }
         self.states[state].accept
     }
+
+    pub fn simplify(&mut self) {
+        for state in self.states.iter_mut() {
+            state.trans.retain(|_, to| *to != state.default_trans);
+        }
+    }
 }
 
 impl From<ENFA> for DFA {
     fn from(mut nfa: ENFA) -> Self {
         nfa.remove_unreachable();
 
-        println!("{nfa:?}");
-
         let mut multi_states = nfa.all_multi_states();
         multi_states.insert(nfa.void_multi_state());
         let mut len = 0;
@@ -97,9 +101,11 @@ impl From<ENFA> for DFA {
             }
         }
 
-        Self {
+        let mut this = Self {
             start: multi_to_dfa[&nfa.start_multi_state()],
             states,
-        }
+        };
+        this.simplify();
+        this
     }
 }