From 9b66929c14ee5219a95c94286edbb651f15f6029 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 22 Apr 2023 00:14:41 -0400 Subject: [PATCH] Update test to use elements to capture the trailing whitespace. --- src/main.rs | 3 ++- src/parser/paragraph.rs | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 0916f22..29423dc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,8 @@ use crate::init_tracing::shutdown_telemetry; use ::organic::parser::document; mod init_tracing; -const TEST_DOC: &'static str = include_str!("../toy_language.txt"); +// const TEST_DOC: &'static str = include_str!("../toy_language.txt"); +const TEST_DOC: &'static str = "foo bar baz\n\nlorem ipsum"; fn main() -> Result<(), Box> { init_telemetry()?; diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs index 94ccf75..c0deadb 100644 --- a/src/parser/paragraph.rs +++ b/src/parser/paragraph.rs @@ -57,9 +57,11 @@ fn paragraph_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st #[cfg(test)] mod tests { + use crate::parser::element_parser::paragraph_element; use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ContextTree; use crate::parser::parser_with_context::parser_with_context; + use crate::parser::source::Source; use super::*; @@ -69,12 +71,12 @@ mod tests { let initial_context: ContextTree<'_, '_> = ContextTree::new(); let document_context = initial_context.with_additional_node(ContextElement::DocumentRoot(input)); - let paragraph_matcher = parser_with_context!(paragraph)(&document_context); + let paragraph_matcher = parser_with_context!(paragraph_element)(&document_context); let (remaining, first_paragraph) = paragraph_matcher(input).expect("Parse first paragraph"); let (remaining, second_paragraph) = paragraph_matcher(remaining).expect("Parse second paragraph."); assert_eq!(remaining, ""); - assert_eq!(first_paragraph.source, "foo bar baz\n\n"); - assert_eq!(second_paragraph.source, "lorem ipsum"); + assert_eq!(first_paragraph.get_source(), "foo bar baz\n\n"); + assert_eq!(second_paragraph.get_source(), "lorem ipsum"); } }