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

Add {open,close}_delim arguments to TokenCursorFrame::new().

Browse Source 
This will facilitate the change in the next commit.

`boolean` arguments aren't great, but the function is only used in three
places within this one file.
This commit is contained in:
Nicholas Nethercote 2022-04-19 13:51:12 +10:00
parent 02317542eb
commit 29c78cc086
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,14 +242,14 @@ struct TokenCursorFrame {
}
impl TokenCursorFrame {
fn new(span: DelimSpan, delim: DelimToken, tts: TokenStream) -> Self {
TokenCursorFrame {
delim,
span,
open_delim: false,
tree_cursor: tts.into_trees(),
close_delim: false,
}
fn new(
span: DelimSpan,
delim: DelimToken,
open_delim: bool,
tts: TokenStream,
close_delim: bool,
) -> Self {
TokenCursorFrame { delim, span, open_delim, tree_cursor: tts.into_trees(), close_delim }
}
}
@ -274,7 +274,7 @@ fn inlined_next(&mut self, desugar_doc_comments: bool) -> (Token, Spacing) {
break (token, spacing);
}
TokenTree::Delimited(sp, delim, tts) => {
let frame = TokenCursorFrame::new(sp, delim, tts);
let frame = TokenCursorFrame::new(sp, delim, false, tts, false);
self.stack.push(mem::replace(&mut self.frame, frame));
}
}
@ -328,6 +328,7 @@ fn inlined_next(&mut self, desugar_doc_comments: bool) -> (Token, Spacing) {
TokenCursorFrame::new(
delim_span,
token::NoDelim,
false,
if attr_style == AttrStyle::Inner {
[
TokenTree::token(token::Pound, span),
@ -343,6 +344,7 @@ fn inlined_next(&mut self, desugar_doc_comments: bool) -> (Token, Spacing) {
.cloned()
.collect::<TokenStream>()
},
false,
),
));
@ -434,9 +436,8 @@ pub fn new(
desugar_doc_comments: bool,
subparser_name: Option<&'static str>,
) -> Self {
let mut start_frame = TokenCursorFrame::new(DelimSpan::dummy(), token::NoDelim, tokens);
start_frame.open_delim = true;
start_frame.close_delim = true;
let start_frame =
TokenCursorFrame::new(DelimSpan::dummy(), token::NoDelim, true, tokens, true);
let mut parser = Parser {
sess,