From 5ae8ac61e509259ebf8514c2217ea7fb6c58c4ba Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 22:04:22 -0400 Subject: [PATCH 1/2] Code structure for fixed width area. --- .../fixed_width_area/indented.org | 8 ++++++ src/compare/diff.rs | 26 +++++++++++++++++++ src/parser/element.rs | 3 +++ src/parser/element_parser.rs | 3 +++ src/parser/fixed_width_area.rs | 11 ++++++++ src/parser/lesser_element.rs | 11 ++++++++ src/parser/mod.rs | 2 ++ 7 files changed, 64 insertions(+) create mode 100644 org_mode_samples/fixed_width_area/indented.org create mode 100644 src/parser/fixed_width_area.rs diff --git a/org_mode_samples/fixed_width_area/indented.org b/org_mode_samples/fixed_width_area/indented.org new file mode 100644 index 0000000..a1835b4 --- /dev/null +++ b/org_mode_samples/fixed_width_area/indented.org @@ -0,0 +1,8 @@ +: Fixed width area + : indented line +: At the top of the file + + + +foo +: Another fixed width area diff --git a/src/compare/diff.rs b/src/compare/diff.rs index fb6a51b..55d16b4 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -12,6 +12,7 @@ use crate::parser::DynamicBlock; use crate::parser::Element; use crate::parser::ExampleBlock; use crate::parser::ExportBlock; +use crate::parser::FixedWidthArea; use crate::parser::FootnoteDefinition; use crate::parser::GreaterBlock; use crate::parser::Heading; @@ -219,6 +220,7 @@ fn compare_element<'s>( Element::Clock(obj) => compare_clock(source, emacs, obj), 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), } } @@ -752,3 +754,27 @@ fn compare_planning<'s>( children: Vec::new(), }) } + +fn compare_fixed_width_area<'s>( + source: &'s str, + emacs: &'s Token<'s>, + rust: &'s FixedWidthArea<'s>, +) -> Result> { + let child_status = Vec::new(); + let mut this_status = DiffStatus::Good; + let emacs_name = "fixed-width"; + 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 e051dd8..623e90e 100644 --- a/src/parser/element.rs +++ b/src/parser/element.rs @@ -10,6 +10,7 @@ use super::lesser_element::CommentBlock; use super::lesser_element::DiarySexp; use super::lesser_element::ExampleBlock; use super::lesser_element::ExportBlock; +use super::lesser_element::FixedWidthArea; use super::lesser_element::Paragraph; use super::lesser_element::Planning; use super::lesser_element::SrcBlock; @@ -36,6 +37,7 @@ pub enum Element<'s> { Clock(Clock<'s>), DiarySexp(DiarySexp<'s>), Planning(Planning<'s>), + FixedWidthArea(FixedWidthArea<'s>), } impl<'s> Source<'s> for Element<'s> { @@ -58,6 +60,7 @@ impl<'s> Source<'s> for Element<'s> { Element::Clock(obj) => obj.source, Element::DiarySexp(obj) => obj.source, Element::Planning(obj) => obj.source, + Element::FixedWidthArea(obj) => obj.source, } } } diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs index c153e9f..824c485 100644 --- a/src/parser/element_parser.rs +++ b/src/parser/element_parser.rs @@ -4,6 +4,7 @@ use super::diary_sexp::diary_sexp; use super::drawer::drawer; use super::dynamic_block::dynamic_block; 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::lesser_block::comment_block; @@ -49,6 +50,7 @@ pub fn non_paragraph_element<'r, 's>( let src_block_matcher = parser_with_context!(src_block)(context); 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); alt(( map(plain_list_matcher, Element::PlainList), map(greater_block_matcher, Element::GreaterBlock), @@ -64,5 +66,6 @@ pub fn non_paragraph_element<'r, 's>( map(src_block_matcher, Element::SrcBlock), map(clock_matcher, Element::Clock), map(diary_sexp_matcher, Element::DiarySexp), + map(fixed_width_area_matcher, Element::FixedWidthArea), ))(input) } diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs new file mode 100644 index 0000000..c6060b5 --- /dev/null +++ b/src/parser/fixed_width_area.rs @@ -0,0 +1,11 @@ +use super::Context; +use crate::error::Res; +use crate::parser::FixedWidthArea; + +#[tracing::instrument(ret, level = "debug")] +pub fn fixed_width_area<'r, 's>( + context: Context<'r, 's>, + input: &'s str, +) -> Res<&'s str, FixedWidthArea<'s>> { + todo!() +} diff --git a/src/parser/lesser_element.rs b/src/parser/lesser_element.rs index 55664c9..c375b68 100644 --- a/src/parser/lesser_element.rs +++ b/src/parser/lesser_element.rs @@ -74,6 +74,11 @@ pub struct Planning<'s> { pub source: &'s str, } +#[derive(Debug)] +pub struct FixedWidthArea<'s> { + pub source: &'s str, +} + impl<'s> Paragraph<'s> { pub fn of_text(input: &'s str) -> Self { let mut objects = Vec::with_capacity(1); @@ -146,3 +151,9 @@ impl<'s> Source<'s> for Planning<'s> { self.source } } + +impl<'s> Source<'s> for FixedWidthArea<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} diff --git a/src/parser/mod.rs b/src/parser/mod.rs index e1b5f2b..2aa4029 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -7,6 +7,7 @@ mod dynamic_block; mod element; mod element_parser; mod exiting; +mod fixed_width_area; mod footnote_definition; mod greater_block; mod greater_element; @@ -47,6 +48,7 @@ pub use lesser_element::CommentBlock; pub use lesser_element::DiarySexp; pub use lesser_element::ExampleBlock; pub use lesser_element::ExportBlock; +pub use lesser_element::FixedWidthArea; pub use lesser_element::Paragraph; pub use lesser_element::Planning; pub use lesser_element::SrcBlock; From 82948327177f6f1ec90627cff56999815ea6b2cd Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 22:11:06 -0400 Subject: [PATCH 2/2] Implement fixed width area. --- src/parser/fixed_width_area.rs | 46 +++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs index c6060b5..3a4f28c 100644 --- a/src/parser/fixed_width_area.rs +++ b/src/parser/fixed_width_area.rs @@ -1,5 +1,23 @@ +use nom::branch::alt; +use nom::bytes::complete::is_not; +use nom::bytes::complete::tag; +use nom::character::complete::line_ending; +use nom::character::complete::space0; +use nom::character::complete::space1; +use nom::combinator::eof; +use nom::combinator::not; +use nom::combinator::opt; +use nom::multi::many0; +use nom::sequence::preceded; +use nom::sequence::tuple; + use super::Context; use crate::error::Res; +use crate::parser::parser_with_context::parser_with_context; +use crate::parser::util::exit_matcher_parser; +use crate::parser::util::get_consumed; +use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; +use crate::parser::util::start_of_line; use crate::parser::FixedWidthArea; #[tracing::instrument(ret, level = "debug")] @@ -7,5 +25,31 @@ pub fn fixed_width_area<'r, 's>( context: Context<'r, 's>, input: &'s str, ) -> Res<&'s str, FixedWidthArea<'s>> { - todo!() + let fixed_width_area_line_matcher = parser_with_context!(fixed_width_area_line)(context); + let exit_matcher = parser_with_context!(exit_matcher_parser)(context); + let (remaining, _first_line) = fixed_width_area_line_matcher(input)?; + let (remaining, _remaining_lines) = + many0(preceded(not(exit_matcher), fixed_width_area_line_matcher))(remaining)?; + + let (remaining, _trailing_ws) = + maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; + + let source = get_consumed(input, remaining); + Ok((remaining, FixedWidthArea { source })) +} + +#[tracing::instrument(ret, level = "debug")] +fn fixed_width_area_line<'r, 's>( + context: Context<'r, 's>, + input: &'s str, +) -> Res<&'s str, &'s str> { + start_of_line(context, input)?; + let (remaining, _indent) = space0(input)?; + let (remaining, (_hash, _leading_whitespace_and_content, _line_ending)) = tuple(( + tag(":"), + opt(tuple((space1, is_not("\r\n")))), + alt((line_ending, eof)), + ))(remaining)?; + let source = get_consumed(input, remaining); + Ok((remaining, source)) }