From c2ccf4da37626711e6e5ad2e093a20b3c179adc4 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 19:02:16 -0400 Subject: [PATCH] Set up the initial code structure for the clock. --- src/compare/diff.rs | 25 +++++++++++++++++++++++++ src/parser/clock.rs | 8 ++++++++ src/parser/element.rs | 3 +++ src/parser/element_parser.rs | 3 +++ src/parser/lesser_element.rs | 11 +++++++++++ src/parser/mod.rs | 2 ++ 6 files changed, 52 insertions(+) create mode 100644 src/parser/clock.rs diff --git a/src/compare/diff.rs b/src/compare/diff.rs index c058490..0ed1a7f 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -1,6 +1,7 @@ use super::sexp::Token; use super::util::assert_bounds; use super::util::assert_name; +use crate::parser::Clock; use crate::parser::Comment; use crate::parser::CommentBlock; use crate::parser::Document; @@ -213,6 +214,7 @@ fn compare_element<'s>( Element::ExampleBlock(obj) => compare_example_block(source, emacs, obj), Element::ExportBlock(obj) => compare_export_block(source, emacs, obj), Element::SrcBlock(obj) => compare_src_block(source, emacs, obj), + Element::Clock(obj) => compare_clock(source, emacs, obj), } } @@ -677,3 +679,26 @@ fn compare_src_block<'s>( children: Vec::new(), }) } + +fn compare_clock<'s>( + source: &'s str, + emacs: &'s Token<'s>, + rust: &'s Clock<'s>, +) -> Result> { + let mut this_status = DiffStatus::Good; + let emacs_name = "clock"; + 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: Vec::new(), + }) +} diff --git a/src/parser/clock.rs b/src/parser/clock.rs new file mode 100644 index 0000000..a3d94c8 --- /dev/null +++ b/src/parser/clock.rs @@ -0,0 +1,8 @@ +use super::Context; +use crate::error::Res; +use crate::parser::Clock; + +#[tracing::instrument(ret, level = "debug")] +pub fn clock<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Clock<'s>> { + todo!() +} diff --git a/src/parser/element.rs b/src/parser/element.rs index dfc8663..fd132f8 100644 --- a/src/parser/element.rs +++ b/src/parser/element.rs @@ -4,6 +4,7 @@ use super::greater_element::GreaterBlock; use super::greater_element::PlainList; use super::greater_element::PropertyDrawer; use super::greater_element::Table; +use super::lesser_element::Clock; use super::lesser_element::Comment; use super::lesser_element::CommentBlock; use super::lesser_element::ExampleBlock; @@ -30,6 +31,7 @@ pub enum Element<'s> { ExampleBlock(ExampleBlock<'s>), ExportBlock(ExportBlock<'s>), SrcBlock(SrcBlock<'s>), + Clock(Clock<'s>), } impl<'s> Source<'s> for Element<'s> { @@ -49,6 +51,7 @@ impl<'s> Source<'s> for Element<'s> { Element::ExampleBlock(obj) => obj.source, Element::ExportBlock(obj) => obj.source, Element::SrcBlock(obj) => obj.source, + Element::Clock(obj) => obj.source, } } } diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs index b7cba56..8e24d1a 100644 --- a/src/parser/element_parser.rs +++ b/src/parser/element_parser.rs @@ -1,3 +1,4 @@ +use super::clock::clock; use super::comment::comment; use super::drawer::drawer; use super::dynamic_block::dynamic_block; @@ -45,6 +46,7 @@ pub fn non_paragraph_element<'r, 's>( let example_block_matcher = parser_with_context!(example_block)(context); let export_block_matcher = parser_with_context!(export_block)(context); let src_block_matcher = parser_with_context!(src_block)(context); + let clock_matcher = parser_with_context!(clock)(context); alt(( map(plain_list_matcher, Element::PlainList), map(greater_block_matcher, Element::GreaterBlock), @@ -58,5 +60,6 @@ pub fn non_paragraph_element<'r, 's>( map(example_block_matcher, Element::ExampleBlock), map(export_block_matcher, Element::ExportBlock), map(src_block_matcher, Element::SrcBlock), + map(clock_matcher, Element::Clock), ))(input) } diff --git a/src/parser/lesser_element.rs b/src/parser/lesser_element.rs index 4c3c822..b7cd106 100644 --- a/src/parser/lesser_element.rs +++ b/src/parser/lesser_element.rs @@ -59,6 +59,11 @@ pub struct SrcBlock<'s> { pub contents: &'s str, } +#[derive(Debug)] +pub struct Clock<'s> { + pub source: &'s str, +} + impl<'s> Paragraph<'s> { pub fn of_text(input: &'s str) -> Self { let mut objects = Vec::with_capacity(1); @@ -113,3 +118,9 @@ impl<'s> Source<'s> for SrcBlock<'s> { self.source } } + +impl<'s> Source<'s> for Clock<'s> { + fn get_source(&'s self) -> &'s str { + self.source + } +} diff --git a/src/parser/mod.rs b/src/parser/mod.rs index eaa1969..d8d4e60 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1,3 +1,4 @@ +mod clock; mod comment; mod document; mod drawer; @@ -37,6 +38,7 @@ pub use greater_element::PlainListItem; pub use greater_element::PropertyDrawer; pub use greater_element::Table; pub use greater_element::TableRow; +pub use lesser_element::Clock; pub use lesser_element::Comment; pub use lesser_element::CommentBlock; pub use lesser_element::ExampleBlock;