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

Make a new naive implementation of plain_list_item.

Browse Source 
Still need to update plain_list_item_end and handle the whitespace ownership issues, but starting from a simplified state will help.
This commit is contained in:
Tom Alexander 2023-08-15 02:02:15 -04:00
parent 72d5f8f35c
commit 7df393f31d
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/parser/plain_list.rs
View File

@ -85,29 +85,12 @@ pub fn plain_list_item<'r, 's>(
let (remaining, leading_whitespace) = space0(input)?; let (remaining, leading_whitespace) = space0(input)?;
// It is fine that we get the indent level using the number of bytes rather than the number of characters because nom's space0 only matches space and tab (0x20 and 0x09) // It is fine that we get the indent level using the number of bytes rather than the number of characters because nom's space0 only matches space and tab (0x20 and 0x09)
let indent_level = leading_whitespace.len(); let indent_level = leading_whitespace.len();
let with_consume_context = context
.with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
.with_additional_node(ContextElement::ListItem(indent_level))
.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
class: ExitClass::Beta,
exit_matcher: &plain_list_item_end,
}));
let without_consume_context = context
.with_additional_node(ContextElement::ListItem(indent_level))
.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
class: ExitClass::Beta,
exit_matcher: &plain_list_item_end,
}));
let with_consume_matcher = parser_with_context!(element(true))(&with_consume_context);
let without_consume_matcher = parser_with_context!(element(true))(&without_consume_context);
let exit_matcher = parser_with_context!(exit_matcher_parser)(&with_consume_context);
let (remaining, bull) = let (remaining, bull) =
verify(bullet, |bull: &str| bull != "*" || indent_level > 0)(remaining)?; verify(bullet, |bull: &str| bull != "*" || indent_level > 0)(remaining)?;
let maybe_contentless_item: Res<&str, &str> = alt((eof, line_ending))(remaining); let maybe_contentless_item: Res<&str, &str> = alt((eof, line_ending))(remaining);
match maybe_contentless_item { match maybe_contentless_item {
Ok((rem, _ws)) => { Ok((rem, _ws)) => {
// TODO: do we need to consume if this isn't the last item?
let source = get_consumed(input, rem); let source = get_consumed(input, rem);
return Ok(( return Ok((
rem, rem,
@ -119,19 +102,25 @@ pub fn plain_list_item<'r, 's>(
}, },
)); ));
} }
Err(_) => { Err(_) => {}
};
let (remaining, _ws) = space1(remaining)?; let (remaining, _ws) = space1(remaining)?;
let (remaining, (mut contents, final_element)) = many_till( let parser_context = context
&with_consume_matcher, .with_additional_node(ContextElement::ListItem(indent_level))
alt(( .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
terminated(&without_consume_matcher, exit_matcher), class: ExitClass::Beta,
preceded( exit_matcher: &plain_list_item_end,
peek(tuple((&with_consume_matcher, exit_matcher))), }));
&without_consume_matcher,
let (remaining, (children, _exit_contents)) = verify(
many_till(
parser_with_context!(element(true))(&parser_context),
parser_with_context!(exit_matcher_parser)(&parser_context),
), ),
)), |(children, _exit_contents)| !children.is_empty(),
)(remaining)?; )(remaining)?;
contents.push(final_element);
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
return Ok(( return Ok((
remaining, remaining,
@ -139,11 +128,9 @@ pub fn plain_list_item<'r, 's>(
source, source,
indentation: indent_level, indentation: indent_level,
bullet: bull, bullet: bull,
children: contents, children,
}, },
)); ));
}
};
} }
#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))] #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]