Skip to content

Pretty printer algorithm revamp step 2 #93065

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
Jan 20, 2022
Merged

Pretty printer algorithm revamp step 2 #93065

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fdb95f5
Inline Printer's advance_right method
dtolnay Jan 19, 2022
e219b2b
Inline Printer's scan_push method
dtolnay Jan 19, 2022
50d722a
Simplify ring buffer pushes
dtolnay Jan 19, 2022
e20d5ab
Inline Printer's scan_pop method
dtolnay Jan 19, 2022
2a14275
Inline Printer's scan_top method
dtolnay Jan 19, 2022
ae28ec5
Inline Printer's scan_pop_bottom method
dtolnay Jan 19, 2022
80139a0
Ensure Printer buf is always indexed using self.left or self.right
dtolnay Jan 19, 2022
947a09a
Replace `if` + `unwrap` with `if let` in check_stack
dtolnay Jan 19, 2022
0490e43
Implement check_stream nonrecursively
dtolnay Jan 19, 2022
a37d272
Implement check_stack nonrecursively
dtolnay Jan 19, 2022
377c9db
Index a single time in check_stack
dtolnay Jan 19, 2022
fe5c4ea
Eliminate a check_stack call on an empty scan stack
dtolnay Jan 19, 2022
6e8b060
Simplify the buffer push done by scan_break
dtolnay Jan 19, 2022
cc66a7f
Eliminate eof token state
dtolnay Jan 19, 2022
4d3faae
Eliminate left and right cursors in favor of ring buffer
dtolnay Jan 19, 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
Prev Previous commit
Next Next commit
Implement check_stack nonrecursively
  • Loading branch information
@dtolnay
dtolnay committed Jan 19, 2022
commit a37d272892172dfe598d9df182fa908d74359c6e
19 changes: 10 additions & 9 deletions compiler/rustc_ast_pretty/src/pp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,27 +378,28 @@ impl Printer {
}
}

fn check_stack(&mut self, k: usize) {
if let Some(&x) = self.scan_stack.front() {
fn check_stack(&mut self, mut k: usize) {
while let Some(&x) = self.scan_stack.front() {
match self.buf[x].token {
Token::Begin(_) => {
if k > 0 {
self.scan_stack.pop_front().unwrap();
self.buf[x].size += self.right_total;
self.check_stack(k - 1);
if k == 0 {
break;
}
self.scan_stack.pop_front().unwrap();
self.buf[x].size += self.right_total;
k -= 1;
}
Token::End => {
// paper says + not =, but that makes no sense.
self.scan_stack.pop_front().unwrap();
self.buf[x].size = 1;
self.check_stack(k + 1);
k += 1;
}
_ => {
self.scan_stack.pop_front().unwrap();
self.buf[x].size += self.right_total;
if k > 0 {
self.check_stack(k);
if k == 0 {
break;
}
}
}
Expand Down