diff --git a/src/compare/sexp.rs b/src/compare/sexp.rs index 948181d..da3bb39 100644 --- a/src/compare/sexp.rs +++ b/src/compare/sexp.rs @@ -11,7 +11,6 @@ use nom::combinator::map; use nom::combinator::not; use nom::combinator::opt; use nom::combinator::peek; -use nom::combinator::verify; use nom::multi::separated_list1; use nom::sequence::delimited; use nom::sequence::preceded; diff --git a/src/parser/document.rs b/src/parser/document.rs index 7887a9c..e5f5933 100644 --- a/src/parser/document.rs +++ b/src/parser/document.rs @@ -32,7 +32,6 @@ use super::source::Source; use super::util::exit_matcher_parser; use super::util::get_consumed; use super::util::start_of_line; -use super::util::trailing_whitespace; use super::Context; #[derive(Debug)] diff --git a/src/parser/element.rs b/src/parser/element.rs index d4e773a..ea1f2b1 100644 --- a/src/parser/element.rs +++ b/src/parser/element.rs @@ -4,13 +4,10 @@ use super::greater_element::GreaterBlock; use super::greater_element::PlainList; use super::greater_element::PropertyDrawer; use super::greater_element::Table; -use super::greater_element::TableRow; use super::lesser_element::Comment; use super::lesser_element::Paragraph; -use super::lesser_element::TableCell; use super::source::Source; use super::Drawer; -use super::PlainListItem; #[derive(Debug)] pub enum Element<'s> { @@ -40,75 +37,3 @@ impl<'s> Source<'s> for Element<'s> { } } } - -impl<'s> Source<'s> for Paragraph<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for PlainList<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for PlainListItem<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for GreaterBlock<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for DynamicBlock<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for FootnoteDefinition<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for Comment<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for Drawer<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for PropertyDrawer<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for Table<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for TableRow<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} - -impl<'s> Source<'s> for TableCell<'s> { - fn get_source(&'s self) -> &'s str { - self.source - } -} diff --git a/src/parser/greater_element.rs b/src/parser/greater_element.rs index 8af70e4..96b2dcb 100644 --- a/src/parser/greater_element.rs +++ b/src/parser/greater_element.rs @@ -1,5 +1,6 @@ use super::element::Element; use super::lesser_element::TableCell; +use super::source::Source; #[derive(Debug)] pub struct PlainList<'s> { @@ -68,3 +69,57 @@ pub struct TableRow<'s> { pub source: &'s str, pub children: Vec>, } + +impl<'s> Source<'s> for PlainList<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for PlainListItem<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for GreaterBlock<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for DynamicBlock<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for FootnoteDefinition<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for Drawer<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for PropertyDrawer<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for Table<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for TableRow<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} diff --git a/src/parser/lesser_element.rs b/src/parser/lesser_element.rs index 44b4f44..faf32a1 100644 --- a/src/parser/lesser_element.rs +++ b/src/parser/lesser_element.rs @@ -1,5 +1,6 @@ use super::object::Object; use super::object::TextMarkup; +use super::source::Source; #[derive(Debug)] pub struct Paragraph<'s> { @@ -28,3 +29,21 @@ impl<'s> Paragraph<'s> { } } } + +impl<'s> Source<'s> for Paragraph<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for TableCell<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} + +impl<'s> Source<'s> for Comment<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +}