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

I think I finally got with_additional_fail_matcher building.

Browse Source
This commit is contained in:
Tom Alexander 2022-07-17 18:17:41 -04:00
parent 8321c071e4
commit 1506a86d97
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/parser/nom_context.rs
View File

@ -1,9 +1,12 @@
use nom::branch::alt; use nom::branch::alt;
use nom::combinator::recognize;
use nom::error::VerboseError; use nom::error::VerboseError;
use nom::IResult; use nom::IResult;
use std::cell::RefCell; use std::cell::RefCell;
use std::rc::Rc; use std::rc::Rc;
use super::text::bold_end;
#[derive(Clone)] #[derive(Clone)]
pub struct NomContext<F> pub struct NomContext<F>
where where
@ -38,17 +41,27 @@ where
} }
} }
// pub fn with_additional_fail_matcher<G, O>(self, additional_fail_matcher: G) -> NomContext<O> pub fn with_additional_fail_matcher<G>(
// where self,
// G: for<'g> FnMut(&'g str) -> IResult<&'g str, &'g str, VerboseError<&'g str>>, additional_fail_matcher: G,
// G: Clone, ) -> NomContext<
// O: for<'o> FnMut(&'o str) -> IResult<&'o str, &'o str, VerboseError<&'o str>>, impl Clone + for<'o> FnMut(&'o str) -> IResult<&'o str, &'o str, VerboseError<&'o str>>,
// O: Clone, >
// { where
G: for<'g> FnMut(&'g str) -> IResult<&'g str, &'g str, VerboseError<&'g str>>,
G: Clone,
{
let mut old_fail_matcher_clone = self.fail_matcher.clone();
let mut new_context =
NomContext::new(move |i| alt((recognize(bold_end), &mut old_fail_matcher_clone))(i));
new_context.can_match_bold = self.can_match_bold;
new_context.can_match_link = self.can_match_link;
// NomContext { // NomContext {
// fail_matcher: move |i| alt((additional_fail_matcher, self.fail_matcher))(i), // fail_matcher: move |i| alt((additional_fail_matcher, &mut old_fail_matcher_clone))(i),
// can_match_bold: self.can_match_bold, // can_match_bold: self.can_match_bold,
// can_match_link: self.can_match_link, // can_match_link: self.can_match_link,
// } // }
// } new_context
}
} }