bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[ui] Rearrange StringReader/TokenTreesReader creation.

Browse source 
`TokenTreesReader` wraps a `StringReader`, but the `into_token_trees`
function obscures this. This commit moves to a more straightforward
control flow.
This commit is contained in:
Nicholas Nethercote 2022-09-26 08:50:52 +10:00
parent 33ba2776c9
commit 33516ac09a
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_parse/src/lexer/mod.rs
View file

@ -48,7 +48,8 @@ pub(crate) fn parse_token_trees<'a>(
start_pos = start_pos + BytePos::from_usize(shebang_len); start_pos = start_pos + BytePos::from_usize(shebang_len);
} }
StringReader { sess, start_pos, pos: start_pos, src, override_span }.into_token_trees() let string_reader = StringReader { sess, start_pos, pos: start_pos, src, override_span };
tokentrees::TokenTreesReader::parse_token_trees(string_reader)
} }
struct StringReader<'a> { struct StringReader<'a> {

37
compiler/rustc_parse/src/lexer/tokentrees.rs
View file

@ -1,5 +1,4 @@
use super::{StringReader, UnmatchedBrace}; use super::{StringReader, UnmatchedBrace};
use rustc_ast::token::{self, Delimiter, Token}; use rustc_ast::token::{self, Delimiter, Token};
use rustc_ast::tokenstream::{DelimSpan, Spacing, TokenStream, TokenTree}; use rustc_ast::tokenstream::{DelimSpan, Spacing, TokenStream, TokenTree};
use rustc_ast_pretty::pprust::token_to_string; use rustc_ast_pretty::pprust::token_to_string;
@ -7,24 +6,7 @@ use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{PErr, PResult}; use rustc_errors::{PErr, PResult};
use rustc_span::Span; use rustc_span::Span;
impl<'a> StringReader<'a> { pub(super) struct TokenTreesReader<'a> {
pub(super) fn into_token_trees(self) -> (PResult<'a, TokenStream>, Vec<UnmatchedBrace>) {
let mut tt_reader = TokenTreesReader {
string_reader: self,
token: Token::dummy(),
open_braces: Vec::new(),
unmatched_braces: Vec::new(),
matching_delim_spans: Vec::new(),
last_unclosed_found_span: None,
last_delim_empty_block_spans: FxHashMap::default(),
matching_block_spans: Vec::new(),
};
let res = tt_reader.parse_all_token_trees();
(res, tt_reader.unmatched_braces)
}
}
struct TokenTreesReader<'a> {
string_reader: StringReader<'a>, string_reader: StringReader<'a>,
token: Token, token: Token,
/// Stack of open delimiters and their spans. Used for error message. /// Stack of open delimiters and their spans. Used for error message.
@ -43,6 +25,23 @@ struct TokenTreesReader<'a> {
} }
impl<'a> TokenTreesReader<'a> { impl<'a> TokenTreesReader<'a> {
pub(super) fn parse_token_trees(
string_reader: StringReader<'a>,
) -> (PResult<'a, TokenStream>, Vec<UnmatchedBrace>) {
let mut tt_reader = TokenTreesReader {
string_reader,
token: Token::dummy(),
open_braces: Vec::new(),
unmatched_braces: Vec::new(),
matching_delim_spans: Vec::new(),
last_unclosed_found_span: None,
last_delim_empty_block_spans: FxHashMap::default(),
matching_block_spans: Vec::new(),
};
let res = tt_reader.parse_all_token_trees();
(res, tt_reader.unmatched_braces)
}
// Parse a stream of tokens into a list of `TokenTree`s, up to an `Eof`. // Parse a stream of tokens into a list of `TokenTree`s, up to an `Eof`.
fn parse_all_token_trees(&mut self) -> PResult<'a, TokenStream> { fn parse_all_token_trees(&mut self) -> PResult<'a, TokenStream> {
self.token = self.string_reader.next_token().0; self.token = self.string_reader.next_token().0;