From bfffde3fdb092b6804a0ab69d30d243e845224e1 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 22:23:59 -0400 Subject: [PATCH] Implement the horizontal rule parser. --- org_mode_samples/horizontal_rule/simple.org | 3 +++ src/compare/diff.rs | 26 ++++++++++++++++++ src/parser/element.rs | 3 +++ src/parser/element_parser.rs | 3 +++ src/parser/horizontal_rule.rs | 29 +++++++++++++++++++++ src/parser/lesser_element.rs | 11 ++++++++ src/parser/mod.rs | 2 ++ 7 files changed, 77 insertions(+) create mode 100644 org_mode_samples/horizontal_rule/simple.org create mode 100644 src/parser/horizontal_rule.rs diff --git a/org_mode_samples/horizontal_rule/simple.org b/org_mode_samples/horizontal_rule/simple.org new file mode 100644 index 00000000..9b5e6ffe --- /dev/null +++ b/org_mode_samples/horizontal_rule/simple.org @@ -0,0 +1,3 @@ +foo + ----- +bar diff --git a/src/compare/diff.rs b/src/compare/diff.rs index 55d16b47..2e596cf5 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -16,6 +16,7 @@ use crate::parser::FixedWidthArea; use crate::parser::FootnoteDefinition; use crate::parser::GreaterBlock; use crate::parser::Heading; +use crate::parser::HorizontalRule; use crate::parser::Paragraph; use crate::parser::PlainList; use crate::parser::PlainListItem; @@ -221,6 +222,7 @@ fn compare_element<'s>( Element::DiarySexp(obj) => compare_diary_sexp(source, emacs, obj), Element::Planning(obj) => compare_planning(source, emacs, obj), Element::FixedWidthArea(obj) => compare_fixed_width_area(source, emacs, obj), + Element::HorizontalRule(obj) => compare_horizontal_rule(source, emacs, obj), } } @@ -778,3 +780,27 @@ fn compare_fixed_width_area<'s>( children: child_status, }) } + +fn compare_horizontal_rule<'s>( + source: &'s str, + emacs: &'s Token<'s>, + rust: &'s HorizontalRule<'s>, +) -> Result> { + let child_status = Vec::new(); + let mut this_status = DiffStatus::Good; + let emacs_name = "horizontal-rule"; + if assert_name(emacs, emacs_name).is_err() { + this_status = DiffStatus::Bad; + } + + if assert_bounds(source, emacs, rust).is_err() { + this_status = DiffStatus::Bad; + } + + Ok(DiffResult { + status: this_status, + name: emacs_name.to_owned(), + message: None, + children: child_status, + }) +} diff --git a/src/parser/element.rs b/src/parser/element.rs index 623e90e2..c3806797 100644 --- a/src/parser/element.rs +++ b/src/parser/element.rs @@ -11,6 +11,7 @@ use super::lesser_element::DiarySexp; use super::lesser_element::ExampleBlock; use super::lesser_element::ExportBlock; use super::lesser_element::FixedWidthArea; +use super::lesser_element::HorizontalRule; use super::lesser_element::Paragraph; use super::lesser_element::Planning; use super::lesser_element::SrcBlock; @@ -38,6 +39,7 @@ pub enum Element<'s> { DiarySexp(DiarySexp<'s>), Planning(Planning<'s>), FixedWidthArea(FixedWidthArea<'s>), + HorizontalRule(HorizontalRule<'s>), } impl<'s> Source<'s> for Element<'s> { @@ -61,6 +63,7 @@ impl<'s> Source<'s> for Element<'s> { Element::DiarySexp(obj) => obj.source, Element::Planning(obj) => obj.source, Element::FixedWidthArea(obj) => obj.source, + Element::HorizontalRule(obj) => obj.source, } } } diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs index 824c4859..2e3918dc 100644 --- a/src/parser/element_parser.rs +++ b/src/parser/element_parser.rs @@ -7,6 +7,7 @@ use super::element::Element; use super::fixed_width_area::fixed_width_area; use super::footnote_definition::footnote_definition; use super::greater_block::greater_block; +use super::horizontal_rule::horizontal_rule; use super::lesser_block::comment_block; use super::lesser_block::example_block; use super::lesser_block::export_block; @@ -51,6 +52,7 @@ pub fn non_paragraph_element<'r, 's>( let clock_matcher = parser_with_context!(clock)(context); let diary_sexp_matcher = parser_with_context!(diary_sexp)(context); let fixed_width_area_matcher = parser_with_context!(fixed_width_area)(context); + let horizontal_rule_matcher = parser_with_context!(horizontal_rule)(context); alt(( map(plain_list_matcher, Element::PlainList), map(greater_block_matcher, Element::GreaterBlock), @@ -67,5 +69,6 @@ pub fn non_paragraph_element<'r, 's>( map(clock_matcher, Element::Clock), map(diary_sexp_matcher, Element::DiarySexp), map(fixed_width_area_matcher, Element::FixedWidthArea), + map(horizontal_rule_matcher, Element::HorizontalRule), ))(input) } diff --git a/src/parser/horizontal_rule.rs b/src/parser/horizontal_rule.rs new file mode 100644 index 00000000..41576297 --- /dev/null +++ b/src/parser/horizontal_rule.rs @@ -0,0 +1,29 @@ +use nom::branch::alt; +use nom::bytes::complete::tag; +use nom::character::complete::line_ending; +use nom::character::complete::space0; +use nom::combinator::eof; +use nom::combinator::recognize; +use nom::combinator::verify; +use nom::multi::many1_count; +use nom::sequence::tuple; + +use super::Context; +use crate::error::Res; +use crate::parser::util::start_of_line; +use crate::parser::HorizontalRule; + +#[tracing::instrument(ret, level = "debug")] +pub fn horizontal_rule<'r, 's>( + context: Context<'r, 's>, + input: &'s str, +) -> Res<&'s str, HorizontalRule<'s>> { + start_of_line(context, input)?; + let (remaining, rule) = recognize(tuple(( + space0, + verify(many1_count(tag("-")), |dashes| *dashes >= 5), + space0, + alt((line_ending, eof)), + )))(input)?; + Ok((remaining, HorizontalRule { source: rule })) +} diff --git a/src/parser/lesser_element.rs b/src/parser/lesser_element.rs index c375b687..782c1ff3 100644 --- a/src/parser/lesser_element.rs +++ b/src/parser/lesser_element.rs @@ -79,6 +79,11 @@ pub struct FixedWidthArea<'s> { pub source: &'s str, } +#[derive(Debug)] +pub struct HorizontalRule<'s> { + pub source: &'s str, +} + impl<'s> Paragraph<'s> { pub fn of_text(input: &'s str) -> Self { let mut objects = Vec::with_capacity(1); @@ -157,3 +162,9 @@ impl<'s> Source<'s> for FixedWidthArea<'s> { self.source } } + +impl<'s> Source<'s> for HorizontalRule<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 2aa4029d..89fa9f4b 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -11,6 +11,7 @@ mod fixed_width_area; mod footnote_definition; mod greater_block; mod greater_element; +mod horizontal_rule; mod lesser_block; mod lesser_element; mod list; @@ -49,6 +50,7 @@ pub use lesser_element::DiarySexp; pub use lesser_element::ExampleBlock; pub use lesser_element::ExportBlock; pub use lesser_element::FixedWidthArea; +pub use lesser_element::HorizontalRule; pub use lesser_element::Paragraph; pub use lesser_element::Planning; pub use lesser_element::SrcBlock;