Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed RichReason::Many #708

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Removed RichReason::Many #708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
109 changes: 20 additions & 89 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,6 @@ pub enum RichReason<'a, T, L = &'static str> {
},
/// An error with a custom message
Custom(String),
/// Multiple unrelated reasons were merged
// TODO: Should we really do this? Possibly better to just unify the unrelated reasons. It's not like consumers
// probably care about reporting 5 different errors for the same location anyway!
Many(Vec<Self>),
}

impl<'a, T, L> RichReason<'a, T, L> {
Expand All @@ -360,7 +356,6 @@ impl<'a, T, L> RichReason<'a, T, L> {
match self {
Self::ExpectedFound { found, .. } => found.as_deref(),
Self::Custom(_) => None,
Self::Many(many) => many.iter().find_map(|r| r.found()),
}
}

Expand All @@ -375,9 +370,6 @@ impl<'a, T, L> RichReason<'a, T, L> {
found: found.map(MaybeRef::into_owned),
},
Self::Custom(msg) => RichReason::Custom(msg),
Self::Many(many) => {
RichReason::Many(many.into_iter().map(RichReason::into_owned).collect())
}
}
}

Expand All @@ -386,38 +378,27 @@ impl<'a, T, L> RichReason<'a, T, L> {
match self {
RichReason::ExpectedFound { found, .. } => found.take(),
RichReason::Custom(_) => None,
RichReason::Many(many) => many.iter_mut().find_map(|r| r.take_found()),
}
}

/// Transform this error's tokens using the given function.
/// Transform this `RichReason`'s tokens using the given function.
///
/// This is useful when you wish to combine errors from multiple compilation passes (lexing and parsing, say) where
/// the token type for each pass is different (`char` vs `MyToken`, say).
pub fn map_token<U, F: FnMut(T) -> U>(self, mut f: F) -> RichReason<'a, U, L>
where
T: Clone,
{
fn map_token_inner<'a, T: Clone, U, F: FnMut(T) -> U, L>(
reason: RichReason<'a, T, L>,
mut f: &mut F,
) -> RichReason<'a, U, L> {
match reason {
RichReason::ExpectedFound { expected, found } => RichReason::ExpectedFound {
expected: expected
.into_iter()
.map(|pat| pat.map_token(&mut f))
.collect(),
found: found.map(|found| f(found.into_inner()).into()),
},
RichReason::Custom(msg) => RichReason::Custom(msg),
RichReason::Many(reasons) => {
RichReason::Many(reasons.into_iter().map(|r| map_token_inner(r, f)).collect())
}
}
match self {
RichReason::ExpectedFound { expected, found } => RichReason::ExpectedFound {
expected: expected
.into_iter()
.map(|pat| pat.map_token(&mut f))
.collect(),
found: found.map(|found| f(found.into_inner()).into()),
},
RichReason::Custom(msg) => RichReason::Custom(msg),
}

map_token_inner(self, &mut f)
}

fn inner_fmt<S>(
Expand Down Expand Up @@ -461,13 +442,6 @@ impl<'a, T, L> RichReason<'a, T, L> {
fmt_span(span, f)?;
}
}
RichReason::Many(_) => {
write!(f, "multiple errors")?;
if let Some(span) = span {
write!(f, " found at ")?;
fmt_span(span, f)?;
}
}
}
#[cfg(feature = "label")]
for (l, s) in context {
Expand All @@ -488,6 +462,9 @@ where
#[inline]
fn flat_merge(self, other: Self) -> Self {
match (self, other) {
// Prefer first error, if ambiguous
(a @ RichReason::Custom(_), _) => a,
(_, b @ RichReason::Custom(_)) => b,
(
RichReason::ExpectedFound {
expected: mut this_expected,
Expand All @@ -512,19 +489,6 @@ where
found,
}
}
(RichReason::Many(mut m1), RichReason::Many(m2)) => {
m1.extend(m2);
RichReason::Many(m1)
}
(RichReason::Many(mut m), other) => {
m.push(other);
RichReason::Many(m)
}
(this, RichReason::Many(mut m)) => {
m.push(this);
RichReason::Many(m)
}
(this, other) => RichReason::Many(vec![this, other]),
}
}
}
Expand Down Expand Up @@ -634,19 +598,10 @@ impl<'a, T, S, L> Rich<'a, T, S, L> {

/// Get an iterator over the expected items associated with this error
pub fn expected(&self) -> impl ExactSizeIterator<Item = &RichPattern<'a, T, L>> {
fn push_expected<'a, 'b, T, L>(
reason: &'b RichReason<'a, T, L>,
v: &mut Vec<&'b RichPattern<'a, T, L>>,
) {
match reason {
RichReason::ExpectedFound { expected, .. } => v.extend(expected.iter()),
RichReason::Custom(_) => {}
RichReason::Many(many) => many.iter().for_each(|r| push_expected(r, v)),
}
match &*self.reason {
RichReason::ExpectedFound { expected, .. } => expected.iter(),
RichReason::Custom(_) => [].iter(),
}
let mut v = Vec::new();
push_expected(&self.reason, &mut v);
v.into_iter()
}

/// Transform this error's tokens using the given function.
Expand Down Expand Up @@ -709,11 +664,11 @@ where
fn merge_expected_found<E: IntoIterator<Item = Option<MaybeRef<'a, I::Token>>>>(
mut self,
new_expected: E,
found: Option<MaybeRef<'a, I::Token>>,
new_found: Option<MaybeRef<'a, I::Token>>,
_span: I::Span,
) -> Self {
match &mut *self.reason {
RichReason::ExpectedFound { expected, found: _ } => {
RichReason::ExpectedFound { expected, found } => {
for new_expected in new_expected {
let new_expected = new_expected
.map(RichPattern::Token)
Expand All @@ -722,33 +677,9 @@ where
expected.push(new_expected);
}
}
*found = found.take().or(new_found); //land
}
RichReason::Many(m) => m.push(RichReason::ExpectedFound {
expected: new_expected
.into_iter()
.map(|tok| {
tok.map(RichPattern::Token)
.unwrap_or(RichPattern::EndOfInput)
})
.collect(),
found,
}),
RichReason::Custom(_) => {
let old = core::mem::replace(&mut *self.reason, RichReason::Many(Vec::new()));
self.reason = Box::new(RichReason::Many(vec![
old,
RichReason::ExpectedFound {
expected: new_expected
.into_iter()
.map(|tok| {
tok.map(RichPattern::Token)
.unwrap_or(RichPattern::EndOfInput)
})
.collect(),
found,
},
]));
}
RichReason::Custom(_) => {}
}
// TOOD: Merge contexts
self
Expand Down
Loading