Skip to content

Retry failed macro matching for diagnostics #103898

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

Merged
merged 7 commits into from
Nov 11, 2022
Merged

Retry failed macro matching for diagnostics #103898

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d13b2a
Store `ErrorGuaranteed` in `ErrorReported`
Noratrieb Oct 27, 2022
6c47848
Small parser cleanups
Noratrieb Oct 27, 2022
2f8a068
Add `Tracker` to track matching operations
Noratrieb Oct 27, 2022
39584b1
Factor out matching into `try_match_macro`
Noratrieb Oct 27, 2022
5f73eac
Retry matching with tracking for diagnostics
Noratrieb Oct 27, 2022
1e21b3c
Add some debug logs to macro matching
Noratrieb Oct 27, 2022
ebfa2ab
Small style improvements
Noratrieb Nov 4, 2022
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
10 changes: 5 additions & 5 deletions compiler/rustc_expand/src/mbe/macro_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ impl TtParser {
// Try zero matches of this sequence, by skipping over it.
self.cur_mps.push(MatcherPos {
idx: idx_first_after,
matches: mp.matches.clone(), // a cheap clone
matches: Lrc::clone(&mp.matches),
});
}

Expand All @@ -464,8 +464,8 @@ impl TtParser {
// sequence. If that's not possible, `ending_mp` will fail quietly when it is
// processed next time around the loop.
let ending_mp = MatcherPos {
idx: mp.idx + 1, // +1 skips the Kleene op
matches: mp.matches.clone(), // a cheap clone
idx: mp.idx + 1, // +1 skips the Kleene op
matches: Lrc::clone(&mp.matches),
};
self.cur_mps.push(ending_mp);

Expand All @@ -480,8 +480,8 @@ impl TtParser {
// separator yet. Try ending the sequence. If that's not possible, `ending_mp`
// will fail quietly when it is processed next time around the loop.
let ending_mp = MatcherPos {
idx: mp.idx + 2, // +2 skips the separator and the Kleene op
matches: mp.matches.clone(), // a cheap clone
idx: mp.idx + 2, // +2 skips the separator and the Kleene op
matches: Lrc::clone(&mp.matches),
};
self.cur_mps.push(ending_mp);

Expand Down