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

Jump to bottom

parse_tt refactorings #94798

Merged
merged 6 commits into from
Mar 12, 2022
Merged

parse_tt refactorings #94798

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09c3e82
Refactor the second half of `parse_tt`.
nnethercote Mar 9, 2022
4d4baf7
Disallow `TokenTree::{MetaVar,MetaVarExpr}` in matchers.
nnethercote Mar 9, 2022
9f0798b
Add a useful assertion.
nnethercote Mar 9, 2022
c13ca42
Move `eof_items` handling entirely within `inner_parse_loop`.
nnethercote Mar 9, 2022
235a87f
Make next_items a `SmallVec`.
nnethercote Mar 9, 2022
95d13fa
Move a `parse_tt` error case into a separate function.
nnethercote Mar 9, 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
Prev Previous commit
Next Next commit
Disallow TokenTree::{MetaVar,MetaVarExpr} in matchers. 
They should only appear in transcribers.
  • Loading branch information
@nnethercote
nnethercote committed Mar 11, 2022
commit 4d4baf7c9a6adb2f8e7071df7af523fa10a568d6
9 changes: 5 additions & 4 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 @@ -439,9 +439,8 @@ fn nameize<I: Iterator<Item = NamedMatch>>(
}
Occupied(..) => return Err((sp, format!("duplicated bind name: {}", bind_name))),
},
// FIXME(c410-f3r) MetaVar and MetaVarExpr should be handled instead of being ignored
// https://github.com/rust-lang/rust/issues/9390
TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) | TokenTree::Token(..) => {}
TokenTree::Token(..) => (),
TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => unreachable!(),
}

Ok(())
Expand Down Expand Up @@ -655,7 +654,9 @@ fn inner_parse_loop<'root, 'tt>(
// rules. NOTE that this is not necessarily an error unless _all_ items in
// `cur_items` end up doing this. There may still be some other matchers that do
// end up working out.
TokenTree::Token(..) | TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => {}
TokenTree::Token(..) => {}

TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => unreachable!(),
}
}
}
Expand Down