Skip to content

Commit

Permalink
Make Parser::num_bump_calls 0-indexed.
Browse files Browse the repository at this point in the history
Currently in `collect_tokens_trailing_token`, `start_pos` and `end_pos`
are 1-indexed by `replace_ranges` is 0-indexed, which is really
confusing. Making them both 0-indexed makes debugging much easier.
  • Loading branch information
nnethercote committed Jul 19, 2024
1 parent f9c7ca7 commit ca66495
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions compiler/rustc_parse/src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,11 @@ impl<'a> Parser<'a> {
// Make parser point to the first token.
parser.bump();

// Change this from 1 back to 0 after the bump. This eases debugging of
// `Parser::collect_tokens_trailing_token` nicer because it makes the
// token positions 0-indexed which is nicer than 1-indexed.
parser.num_bump_calls = 0;

parser
}

Expand Down
12 changes: 6 additions & 6 deletions compiler/rustc_parse/src/parser/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,7 @@ fn debug_lookahead() {
},
},
tokens: [],
approx_token_stream_pos: 1,
approx_token_stream_pos: 0,
..
}"
);
Expand Down Expand Up @@ -1566,7 +1566,7 @@ fn debug_lookahead() {
Parenthesis,
),
],
approx_token_stream_pos: 1,
approx_token_stream_pos: 0,
..
}"
);
Expand Down Expand Up @@ -1631,7 +1631,7 @@ fn debug_lookahead() {
Semi,
Eof,
],
approx_token_stream_pos: 1,
approx_token_stream_pos: 0,
..
}"
);
Expand Down Expand Up @@ -1663,7 +1663,7 @@ fn debug_lookahead() {
No,
),
],
approx_token_stream_pos: 9,
approx_token_stream_pos: 8,
..
}"
);
Expand Down Expand Up @@ -1701,7 +1701,7 @@ fn debug_lookahead() {
No,
),
],
approx_token_stream_pos: 9,
approx_token_stream_pos: 8,
..
}"
);
Expand All @@ -1728,7 +1728,7 @@ fn debug_lookahead() {
tokens: [
Eof,
],
approx_token_stream_pos: 15,
approx_token_stream_pos: 14,
..
}"
);
Expand Down

0 comments on commit ca66495

Please sign in to comment.