tamer: parse::LowerIter: Generic inner TripIter iterator
This commit is preparing to compose LowerIter directly. DEV-11864main
parent
f218c452b9
commit
9edc32dd3b
|
@ -715,7 +715,7 @@ impl<S: ParseState, I: TokenStream<S::Token>> Parser<S, I> {
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn lower_while_ok<LS, U, E>(
|
pub fn lower_while_ok<LS, U, E>(
|
||||||
&mut self,
|
&mut self,
|
||||||
f: impl FnOnce(&mut LowerIter<S, I, LS>) -> Result<U, E>,
|
f: impl FnOnce(&mut LowerIter<S, Parser<S, I>, LS>) -> Result<U, E>,
|
||||||
) -> Result<U, E>
|
) -> Result<U, E>
|
||||||
where
|
where
|
||||||
LS: ParseState<Token = S::Object>,
|
LS: ParseState<Token = S::Object>,
|
||||||
|
@ -739,7 +739,7 @@ impl<S: ParseState, I: TokenStream<S::Token>> Parser<S, I> {
|
||||||
pub struct LowerIter<'a, 'b, S, I, LS>
|
pub struct LowerIter<'a, 'b, S, I, LS>
|
||||||
where
|
where
|
||||||
S: ParseState,
|
S: ParseState,
|
||||||
I: TokenStream<S::Token>,
|
I: Iterator<Item = ParsedResult<S>>,
|
||||||
LS: ParseState<Token = S::Object>,
|
LS: ParseState<Token = S::Object>,
|
||||||
<S as ParseState>::Object: Token,
|
<S as ParseState>::Object: Token,
|
||||||
{
|
{
|
||||||
|
@ -750,7 +750,7 @@ where
|
||||||
/// with the outer [`Result`] having been stripped by a [`TripIter`].
|
/// with the outer [`Result`] having been stripped by a [`TripIter`].
|
||||||
toks: &'a mut TripIter<
|
toks: &'a mut TripIter<
|
||||||
'b,
|
'b,
|
||||||
Parser<S, I>,
|
I,
|
||||||
Parsed<S::Object>,
|
Parsed<S::Object>,
|
||||||
ParseError<S::Token, S::Error>,
|
ParseError<S::Token, S::Error>,
|
||||||
>,
|
>,
|
||||||
|
@ -759,7 +759,7 @@ where
|
||||||
impl<'a, 'b, S, I, LS> Iterator for LowerIter<'a, 'b, S, I, LS>
|
impl<'a, 'b, S, I, LS> Iterator for LowerIter<'a, 'b, S, I, LS>
|
||||||
where
|
where
|
||||||
S: ParseState,
|
S: ParseState,
|
||||||
I: TokenStream<S::Token>,
|
I: Iterator<Item = ParsedResult<S>>,
|
||||||
LS: ParseState<Token = S::Object>,
|
LS: ParseState<Token = S::Object>,
|
||||||
<S as ParseState>::Object: Token,
|
<S as ParseState>::Object: Token,
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue