Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/combinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1311,6 +1311,8 @@ where
{
#[inline(always)]
fn go<M: Mode>(&self, inp: &mut InputRef<'src, '_, I, E>) -> PResult<M, O> {
let before = inp.save();

let inp2 = self.parser_b.go::<Emit>(inp)?;

let alt = inp.errors.alt.take();
Expand All @@ -1327,11 +1329,21 @@ where
&mut memos,
);

// TODO: Translate secondary error offsets too
// Translate error offsets to the start of the outer pattern
// This is not idea, but it mostly prevents error prioritisation issues
let new_alt = inp.errors.alt.take();
inp.errors.alt = alt;
if let Some(new_alt) = new_alt {
inp.add_alt_err(&inp.cursor().inner, new_alt.err);
inp.add_alt_err(&before.cursor().inner, new_alt.err);
}
for err in inp
.errors
.secondary
.get_mut(before.err_count..)
.into_iter()
.flatten()
{
err.pos = before.cursor().inner.clone();
}

res
Expand Down