Swap in the new TestContext everywhere.
This commit is contained in:
@@ -5,7 +5,9 @@ use std::rc::Rc;
|
||||
use crate::parser::parser_with_context::parser_with_context;
|
||||
use crate::parser::text::paragraph_end;
|
||||
|
||||
use super::nom_context::ContextData;
|
||||
use super::nom_context::NomContext;
|
||||
use super::nom_context::TestContext;
|
||||
use super::text::bold_end;
|
||||
use super::text::bold_start;
|
||||
use super::text::line_break;
|
||||
@@ -24,8 +26,11 @@ use nom::multi::many_till;
|
||||
use nom::sequence::tuple;
|
||||
use nom::IResult;
|
||||
|
||||
fn flat_text_element<'s, 'r>(i: &'s str, context: &'r NomContext) -> Res<&'s str, TextElement<'s>> {
|
||||
context.not_matching_fail(i)?;
|
||||
fn flat_text_element<'s, 'r>(
|
||||
i: &'s str,
|
||||
context: &'r TestContext<ContextData>,
|
||||
) -> Res<&'s str, TextElement<'s>> {
|
||||
// context.not_matching_fail(i)?;
|
||||
|
||||
alt((
|
||||
map(span, TextElement::Span),
|
||||
@@ -37,14 +42,14 @@ fn flat_text_element<'s, 'r>(i: &'s str, context: &'r NomContext) -> Res<&'s str
|
||||
))(i)
|
||||
}
|
||||
|
||||
fn flat_bold<'s, 'r>(i: &'s str, context: &'r NomContext) -> Res<&'s str, TextElement<'s>> {
|
||||
fn flat_bold<'s, 'r>(i: &'s str, context: &'r TestContext<ContextData>) -> Res<&'s str, TextElement<'s>> {
|
||||
// let new_context = context.without_bold(Rc::new(RefCell::new(recognize(bold_end))));
|
||||
todo!()
|
||||
}
|
||||
|
||||
pub fn paragraph<'s, 'r>(
|
||||
i: &'s str,
|
||||
context: &'r NomContext,
|
||||
context: &'r TestContext<ContextData>,
|
||||
) -> Res<&'s str, (Vec<TextElement<'s>>, &'s str)> {
|
||||
let text_element_parser = parser_with_context!(flat_text_element)(context);
|
||||
many_till(text_element_parser, paragraph_end)(i)
|
||||
|
||||
Reference in New Issue
Block a user