Skip to content

More lexer improvements #102302

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
bors merged 15 commits into from
Sep 28, 2022
Merged

More lexer improvements #102302

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
66e9b11
Rearrange `TokenTreesReader::parse_token_tree`.
nnethercote Sep 21, 2022
14281e6
Remove unnecessary `spacing` assignment.
nnethercote Sep 21, 2022
9640d1c
Move `#!` checking.
nnethercote Sep 21, 2022
d7928a9
Clarify spacing computation.
nnethercote Sep 21, 2022
5b2075e
Remove `TokenTreesReader::bump`.
nnethercote Sep 21, 2022
33ba277
Remove `ast::Token::take`.
nnethercote Sep 26, 2022
33516ac
[ui] Rearrange `StringReader`/`TokenTreesReader` creation.
nnethercote Sep 25, 2022
aa6bfaf
Make `rustc_lexer::cursor::Cursor` public.
nnethercote Sep 25, 2022
ceb25d1
Use less DRY in `cook_lexer_token`.
nnethercote Sep 26, 2022
cc0022a
Rename some things.
nnethercote Sep 26, 2022
da84f0f
Add `rustc_lexer::TokenKind::Eof`.
nnethercote Sep 26, 2022
fb4dba0
Inline and remove `cook_lexer_token`.
nnethercote Sep 26, 2022
880ebb6
Minor improvements.
nnethercote Sep 26, 2022
7f7e216
Rename some variables.
nnethercote Sep 27, 2022
d0a26ac
Address review comments.
nnethercote Sep 28, 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
17 changes: 8 additions & 9 deletions compiler/rustc_parse/src/lexer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,16 @@ pub struct UnmatchedBrace {

pub(crate) fn parse_token_trees<'a>(
sess: &'a ParseSess,
src: &'a str,
start_pos: BytePos,
mut src: &'a str,
mut start_pos: BytePos,
override_span: Option<Span>,
) -> (PResult<'a, TokenStream>, Vec<UnmatchedBrace>) {
// Skip `#!`, if present.
if let Some(shebang_len) = rustc_lexer::strip_shebang(src) {
src = &src[shebang_len..];
start_pos = start_pos + BytePos::from_usize(shebang_len);
}

StringReader { sess, start_pos, pos: start_pos, src, override_span }.into_token_trees()
}

Expand All @@ -65,13 +71,6 @@ impl<'a> StringReader<'a> {
fn next_token(&mut self) -> (Spacing, Token) {
let mut spacing = Spacing::Joint;

// Skip `#!` at the start of the file
if self.pos == self.start_pos
&& let Some(shebang_len) = rustc_lexer::strip_shebang(self.src)
{
self.pos = self.pos + BytePos::from_usize(shebang_len);
}

// Skip trivial (whitespace & comments) tokens
loop {
let start_src_index = self.src_index(self.pos);
Expand Down