talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update test to use elements to capture the trailing whitespace.

Browse Source
This commit is contained in:
Tom Alexander 2023-04-22 00:14:41 -04:00
parent 7b7779ee7e
commit 9b66929c14
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.rs
View File

@ -4,7 +4,8 @@ use crate::init_tracing::shutdown_telemetry;
use ::organic::parser::document; use ::organic::parser::document;
mod init_tracing; 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<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
init_telemetry()?; init_telemetry()?;

8
src/parser/paragraph.rs
View File

@ -57,9 +57,11 @@ fn paragraph_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::parser::element_parser::paragraph_element;
use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ContextElement;
use crate::parser::parser_context::ContextTree; use crate::parser::parser_context::ContextTree;
use crate::parser::parser_with_context::parser_with_context; use crate::parser::parser_with_context::parser_with_context;
use crate::parser::source::Source;
use super::*; use super::*;
@ -69,12 +71,12 @@ mod tests {
let initial_context: ContextTree<'_, '_> = ContextTree::new(); let initial_context: ContextTree<'_, '_> = ContextTree::new();
let document_context = let document_context =
initial_context.with_additional_node(ContextElement::DocumentRoot(input)); 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, first_paragraph) = paragraph_matcher(input).expect("Parse first paragraph");
let (remaining, second_paragraph) = let (remaining, second_paragraph) =
paragraph_matcher(remaining).expect("Parse second paragraph."); paragraph_matcher(remaining).expect("Parse second paragraph.");
assert_eq!(remaining, ""); assert_eq!(remaining, "");
assert_eq!(first_paragraph.source, "foo bar baz\n\n"); assert_eq!(first_paragraph.get_source(), "foo bar baz\n\n");
assert_eq!(second_paragraph.source, "lorem ipsum"); assert_eq!(second_paragraph.get_source(), "lorem ipsum");
} }
} }