From f0bab39778760c19e1c20a4493eb816493939856 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 22:33:10 -0400 Subject: [PATCH] Code structure for keyword. --- org_mode_samples/keyword/simple.org | 2 ++ src/compare/diff.rs | 26 ++++++++++++++++++++++++++ src/parser/element.rs | 3 +++ src/parser/element_parser.rs | 3 +++ src/parser/keyword.rs | 26 ++++++++++++++++++++++++++ src/parser/lesser_element.rs | 11 +++++++++++ src/parser/mod.rs | 2 ++ 7 files changed, 73 insertions(+) create mode 100644 org_mode_samples/keyword/simple.org create mode 100644 src/parser/keyword.rs diff --git a/org_mode_samples/keyword/simple.org b/org_mode_samples/keyword/simple.org new file mode 100644 index 0000000..5cb7d78 --- /dev/null +++ b/org_mode_samples/keyword/simple.org @@ -0,0 +1,2 @@ +#+FOO: BAR +#+LOREM: IPSUM diff --git a/src/compare/diff.rs b/src/compare/diff.rs index 2e596cf..73d2ae9 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -17,6 +17,7 @@ use crate::parser::FootnoteDefinition; use crate::parser::GreaterBlock; use crate::parser::Heading; use crate::parser::HorizontalRule; +use crate::parser::Keyword; use crate::parser::Paragraph; use crate::parser::PlainList; use crate::parser::PlainListItem; @@ -223,6 +224,7 @@ fn compare_element<'s>( 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), + Element::Keyword(obj) => compare_keyword(source, emacs, obj), } } @@ -804,3 +806,27 @@ fn compare_horizontal_rule<'s>( children: child_status, }) } + +fn compare_keyword<'s>( + source: &'s str, + emacs: &'s Token<'s>, + rust: &'s Keyword<'s>, +) -> Result> { + let child_status = Vec::new(); + let mut this_status = DiffStatus::Good; + let emacs_name = "keyword"; + 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 c380679..f245744 100644 --- a/src/parser/element.rs +++ b/src/parser/element.rs @@ -12,6 +12,7 @@ use super::lesser_element::ExampleBlock; use super::lesser_element::ExportBlock; use super::lesser_element::FixedWidthArea; use super::lesser_element::HorizontalRule; +use super::lesser_element::Keyword; use super::lesser_element::Paragraph; use super::lesser_element::Planning; use super::lesser_element::SrcBlock; @@ -40,6 +41,7 @@ pub enum Element<'s> { Planning(Planning<'s>), FixedWidthArea(FixedWidthArea<'s>), HorizontalRule(HorizontalRule<'s>), + Keyword(Keyword<'s>), } impl<'s> Source<'s> for Element<'s> { @@ -64,6 +66,7 @@ impl<'s> Source<'s> for Element<'s> { Element::Planning(obj) => obj.source, Element::FixedWidthArea(obj) => obj.source, Element::HorizontalRule(obj) => obj.source, + Element::Keyword(obj) => obj.source, } } } diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs index 2e3918d..e2ccc9b 100644 --- a/src/parser/element_parser.rs +++ b/src/parser/element_parser.rs @@ -8,6 +8,7 @@ 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::keyword::keyword; use super::lesser_block::comment_block; use super::lesser_block::example_block; use super::lesser_block::export_block; @@ -53,6 +54,7 @@ pub fn non_paragraph_element<'r, 's>( 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); + let keyword_matcher = parser_with_context!(keyword)(context); alt(( map(plain_list_matcher, Element::PlainList), map(greater_block_matcher, Element::GreaterBlock), @@ -70,5 +72,6 @@ pub fn non_paragraph_element<'r, 's>( map(diary_sexp_matcher, Element::DiarySexp), map(fixed_width_area_matcher, Element::FixedWidthArea), map(horizontal_rule_matcher, Element::HorizontalRule), + map(keyword_matcher, Element::Keyword), ))(input) } diff --git a/src/parser/keyword.rs b/src/parser/keyword.rs new file mode 100644 index 0000000..499dc08 --- /dev/null +++ b/src/parser/keyword.rs @@ -0,0 +1,26 @@ +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::Keyword; + +#[tracing::instrument(ret, level = "debug")] +pub fn keyword<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Keyword<'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, Keyword { source: rule })) +} diff --git a/src/parser/lesser_element.rs b/src/parser/lesser_element.rs index 782c1ff..19e6e83 100644 --- a/src/parser/lesser_element.rs +++ b/src/parser/lesser_element.rs @@ -84,6 +84,11 @@ pub struct HorizontalRule<'s> { pub source: &'s str, } +#[derive(Debug)] +pub struct Keyword<'s> { + pub source: &'s str, +} + impl<'s> Paragraph<'s> { pub fn of_text(input: &'s str) -> Self { let mut objects = Vec::with_capacity(1); @@ -168,3 +173,9 @@ impl<'s> Source<'s> for HorizontalRule<'s> { self.source } } + +impl<'s> Source<'s> for Keyword<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 89fa9f4..f680b58 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -12,6 +12,7 @@ mod footnote_definition; mod greater_block; mod greater_element; mod horizontal_rule; +mod keyword; mod lesser_block; mod lesser_element; mod list; @@ -51,6 +52,7 @@ pub use lesser_element::ExampleBlock; pub use lesser_element::ExportBlock; pub use lesser_element::FixedWidthArea; pub use lesser_element::HorizontalRule; +pub use lesser_element::Keyword; pub use lesser_element::Paragraph; pub use lesser_element::Planning; pub use lesser_element::SrcBlock;