summaryrefslogtreecommitdiff
path: root/grammar/src/tests/test_grammar_left_closure.rs
diff options
context:
space:
mode:
Diffstat (limited to 'grammar/src/tests/test_grammar_left_closure.rs')
-rw-r--r--grammar/src/tests/test_grammar_left_closure.rs38
1 files changed, 25 insertions, 13 deletions
diff --git a/grammar/src/tests/test_grammar_left_closure.rs b/grammar/src/tests/test_grammar_left_closure.rs
index 003c211..ffc7c0f 100644
--- a/grammar/src/tests/test_grammar_left_closure.rs
+++ b/grammar/src/tests/test_grammar_left_closure.rs
@@ -33,9 +33,6 @@ fn test_regex() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
-// We ignore this test by default as it is possibly involved with
-// printing to a graphviz file.
-#[ignore]
#[test]
fn test_nfa() -> Result<(), Box<dyn std::error::Error>> {
let mut grammar = new_notes_grammar()?;
@@ -69,19 +66,22 @@ fn test_nfa() -> Result<(), Box<dyn std::error::Error>> {
grammar
.left_closure_to_nfa(&closure)
.map(|_| ())
- .map_err(Into::into)
+ .map_err(Into::<Box<dyn std::error::Error>>::into)?;
// let _nfa = grammar.left_closure_to_nfa(&closure)?;
- // writeln!(lock, "Not printing nfa to nfa.gv")?;
+ #[cfg(features = "test-print-viz")]
+ {
+ writeln!(lock, "Not printing nfa to nfa.gv")?;
- // nfa.print_viz("nfa.gv").map_err(Into::into)
+ nfa.print_viz("nfa.gv")
+ .map_err(Into::<Box<dyn std::error::Error>>::into)?;
+ }
- // Ok(())
+ Ok(())
}
#[test]
-#[ignore]
fn test_remove_epsilon() -> Result<(), Box<dyn std::error::Error>> {
let mut lock = stdout().lock();
@@ -123,17 +123,18 @@ fn test_remove_epsilon() -> Result<(), Box<dyn std::error::Error>> {
let mut nfa = grammar.left_closure_to_nfa(&closure)?;
+ #[cfg(features = "test-print-viz")]
nfa.print_viz("nfa_orig.gv")?;
nfa.remove_epsilon(|label| label.get_value().is_none())?;
+ #[cfg(features = "test-print-viz")]
nfa.print_viz("nfa_no_epsilon.gv")?;
Ok(())
}
#[test]
-#[ignore]
fn test_remove_dead() -> Result<(), Box<dyn std::error::Error>> {
let mut grammar = new_paren_grammar()?;
let closure = new_closure_regex(&mut grammar)?;
@@ -173,9 +174,10 @@ fn test_remove_dead() -> Result<(), Box<dyn std::error::Error>> {
let mut nfa = grammar.left_closure_to_nfa(&closure)?;
+ #[cfg(features = "test-print-viz")]
nfa.print_viz("nfa_orig.gv")?;
- nfa.remove_epsilon(|label| label.get_value().is_none())?;
+ // nfa.remove_epsilon(|label| label.get_value().is_none())?;
let accumulators: HashSet<usize> = accumulators.into_iter().collect();
@@ -183,15 +185,22 @@ fn test_remove_dead() -> Result<(), Box<dyn std::error::Error>> {
let grammar_reserve_node = |node| accumulators.contains(&node);
+ nfa.closure(
+ |label| label.get_value().is_none(),
+ true,
+ |two_edges| two_edges.second_edge().2,
+ |label| label.get_value().is_none(),
+ )?;
+
nfa.remove_dead(grammar_reserve_node)?;
+ #[cfg(features = "test-print-viz")]
nfa.print_viz("nfa_no_dead.gv")?;
Ok(())
}
#[test]
-#[ignore]
fn test_nulling() -> Result<(), Box<dyn std::error::Error>> {
// TODO: Test more grammars.
let mut grammar = new_right_recursive_grammar()?;
@@ -273,9 +282,12 @@ fn test_nulling() -> Result<(), Box<dyn std::error::Error>> {
nfa.remove_dead(grammar_reserve_nodes)?;
- writeln!(lock, "Printing nfa to nfa.gv")?;
+ #[cfg(features = "test-print-viz")]
+ {
+ writeln!(lock, "Printing nfa to nfa.gv")?;
- nfa.print_viz("nfa.gv")?;
+ nfa.print_viz("nfa.gv")?;
+ }
Ok(())
}