diff --git a/src/parser/document.rs b/src/parser/document.rs index 06ca8af8..f2e4308b 100644 --- a/src/parser/document.rs +++ b/src/parser/document.rs @@ -16,7 +16,6 @@ use nom::sequence::tuple; use crate::parser::element::element; use crate::parser::exiting::ExitClass; use crate::parser::object::standard_set_object; -use crate::parser::parser_context::ChainBehavior; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ContextTree; use crate::parser::parser_context::ExitMatcherNode; diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs index 358f3506..c126af32 100644 --- a/src/parser/drawer.rs +++ b/src/parser/drawer.rs @@ -12,7 +12,6 @@ use super::Context; use crate::parser::element::element; use crate::parser::error::Res; use crate::parser::exiting::ExitClass; -use crate::parser::parser_context::ChainBehavior; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; diff --git a/src/parser/exiting.rs b/src/parser/exiting.rs index c09b3e27..a7e3fa7e 100644 --- a/src/parser/exiting.rs +++ b/src/parser/exiting.rs @@ -9,3 +9,9 @@ pub enum ExitClass { /// Elements who cede priority to alpha elements when matching. Beta = 300, } + +impl std::fmt::Display for ExitClass { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} diff --git a/src/parser/footnote_definition.rs b/src/parser/footnote_definition.rs index 7518a4e5..307b04bc 100644 --- a/src/parser/footnote_definition.rs +++ b/src/parser/footnote_definition.rs @@ -4,7 +4,6 @@ use super::Context; use crate::parser::element::element; use crate::parser::exiting::ExitClass; use crate::parser::greater_element::FootnoteDefinition; -use crate::parser::parser_context::ChainBehavior; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs index e3f4f973..20f0a734 100644 --- a/src/parser/greater_block.rs +++ b/src/parser/greater_block.rs @@ -5,7 +5,6 @@ use crate::parser::error::CustomError; use crate::parser::error::MyError; use crate::parser::exiting::ExitClass; use crate::parser::greater_element::GreaterBlock; -use crate::parser::parser_context::ChainBehavior; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs index 861fef12..c3505295 100644 --- a/src/parser/paragraph.rs +++ b/src/parser/paragraph.rs @@ -8,7 +8,6 @@ use nom::sequence::tuple; use crate::parser::exiting::ExitClass; use crate::parser::object::standard_set_object; -use crate::parser::parser_context::ChainBehavior; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; diff --git a/src/parser/parser_context.rs b/src/parser/parser_context.rs index 7e247a02..e113d214 100644 --- a/src/parser/parser_context.rs +++ b/src/parser/parser_context.rs @@ -158,23 +158,10 @@ pub struct ExitMatcherNode<'r> { pub class: ExitClass, } -#[derive(Clone)] -pub enum ChainBehavior<'r> { - AndParent(Option<&'r Matcher>), - IgnoreParent(Option<&'r Matcher>), -} - impl<'r> std::fmt::Debug for ExitMatcherNode<'r> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let mut formatter = f.debug_struct("ExitMatcherNode"); - // match self { - // ChainBehavior::AndParent(_) => { - // formatter = formatter.field("type", &"AndParent"); - // } - // ChainBehavior::IgnoreParent(_) => { - // formatter = formatter.field("type", &"IgnoreParent"); - // } - // }; + formatter.field("class", &self.class.to_string()); formatter.finish() } } diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs index a030905c..f4740225 100644 --- a/src/parser/plain_list.rs +++ b/src/parser/plain_list.rs @@ -9,7 +9,6 @@ use super::util::non_whitespace_character; use super::Context; use crate::parser::element::element; use crate::parser::exiting::ExitClass; -use crate::parser::parser_context::ChainBehavior; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::util::blank_line;