mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange TokenCursor::inlined_next().

Browse Source 
In particular, avoid wrapping a token within `TokenTree::Token` and then
immediately matching it and returning the token within. Just return the
token immediately.
This commit is contained in:
Nicholas Nethercote 2022-04-19 13:41:02 +10:00
parent b1e6dee596
commit 02317542eb
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
compiler/rustc_parse/src/parser/mod.rs
View File

@ -262,29 +262,32 @@ fn next(&mut self, desugar_doc_comments: bool) -> (Token, Spacing) {
#[inline(always)]
fn inlined_next(&mut self, desugar_doc_comments: bool) -> (Token, Spacing) {
let (token, spacing) = loop {
let (tree, spacing) = if !self.frame.open_delim {
if !self.frame.open_delim {
self.frame.open_delim = true;
TokenTree::token(token::OpenDelim(self.frame.delim), self.frame.span.open).into()
} else if let Some(tree) = self.frame.tree_cursor.next_with_spacing() {
tree
return (
Token::new(token::OpenDelim(self.frame.delim), self.frame.span.open),
Spacing::Alone,
);
} else if let Some((tree, spacing)) = self.frame.tree_cursor.next_with_spacing() {
match tree {
TokenTree::Token(token) => {
break (token, spacing);
}
TokenTree::Delimited(sp, delim, tts) => {
let frame = TokenCursorFrame::new(sp, delim, tts);
self.stack.push(mem::replace(&mut self.frame, frame));
}
}
} else if !self.frame.close_delim {
self.frame.close_delim = true;
TokenTree::token(token::CloseDelim(self.frame.delim), self.frame.span.close).into()
return (
Token::new(token::CloseDelim(self.frame.delim), self.frame.span.close),
Spacing::Alone,
);
} else if let Some(frame) = self.stack.pop() {
self.frame = frame;
continue;
} else {
(TokenTree::Token(Token::new(token::Eof, DUMMY_SP)), Spacing::Alone)
};
match tree {
TokenTree::Token(token) => {
break (token, spacing);
}
TokenTree::Delimited(sp, delim, tts) => {
let frame = TokenCursorFrame::new(sp, delim, tts);
self.stack.push(mem::replace(&mut self.frame, frame));
}
return (Token::new(token::Eof, DUMMY_SP), Spacing::Alone);
}
};