Skip to content
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

Clarify the workings of StringReader in the lexer #36470

Closed
wants to merge 6 commits into from
Closed

Clarify the workings of StringReader in the lexer #36470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8333bd7
Rename StringReader::last_pos as curr_pos.
nnethercote Sep 14, 2016
1ea0c89
Rename StringReader::pos as next_pos.
nnethercote Sep 14, 2016
ee7bc2d
Rename StringReader::col as curr_col.
nnethercote Sep 14, 2016
33f4651
Streamline StringReader::bump.
nnethercote Sep 14, 2016
6535111
Clarify StringReader::bump.
nnethercote Sep 14, 2016
a1984ae
Simplify `start_bpos` calculation in scan_comment().
nnethercote Sep 14, 2016
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
18 changes: 9 additions & 9 deletions src/libsyntax/parse/lexer/comments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ fn push_blank_line_comment(rdr: &StringReader, comments: &mut Vec<Comment>) {
comments.push(Comment {
style: BlankLine,
lines: Vec::new(),
pos: rdr.last_pos,
pos: rdr.curr_pos,
});
}

fn consume_whitespace_counting_blank_lines(rdr: &mut StringReader, comments: &mut Vec<Comment>) {
while is_pattern_whitespace(rdr.curr) && !rdr.is_eof() {
if rdr.col == CharPos(0) && rdr.curr_is('\n') {
if rdr.curr_col == CharPos(0) && rdr.curr_is('\n') {
push_blank_line_comment(rdr, &mut *comments);
}
rdr.bump();
Expand All @@ -167,7 +167,7 @@ fn read_shebang_comment(rdr: &mut StringReader,
code_to_the_left: bool,
comments: &mut Vec<Comment>) {
debug!(">>> shebang comment");
let p = rdr.last_pos;
let p = rdr.curr_pos;
debug!("<<< shebang comment");
comments.push(Comment {
style: if code_to_the_left { Trailing } else { Isolated },
Expand All @@ -180,7 +180,7 @@ fn read_line_comments(rdr: &mut StringReader,
code_to_the_left: bool,
comments: &mut Vec<Comment>) {
debug!(">>> line comments");
let p = rdr.last_pos;
let p = rdr.curr_pos;
let mut lines: Vec<String> = Vec::new();
while rdr.curr_is('/') && rdr.nextch_is('/') {
let line = rdr.read_one_line_comment();
Expand Down Expand Up @@ -240,9 +240,9 @@ fn read_block_comment(rdr: &mut StringReader,
code_to_the_left: bool,
comments: &mut Vec<Comment>) {
debug!(">>> block comment");
let p = rdr.last_pos;
let p = rdr.curr_pos;
let mut lines: Vec<String> = Vec::new();
let col = rdr.col;
let curr_col = rdr.curr_col;
rdr.bump();
rdr.bump();

Expand Down Expand Up @@ -272,7 +272,7 @@ fn read_block_comment(rdr: &mut StringReader,
panic!(rdr.fatal("unterminated block comment"));
}
if rdr.curr_is('\n') {
trim_whitespace_prefix_and_push_line(&mut lines, curr_line, col);
trim_whitespace_prefix_and_push_line(&mut lines, curr_line, curr_col);
curr_line = String::new();
rdr.bump();
} else {
Expand All @@ -295,7 +295,7 @@ fn read_block_comment(rdr: &mut StringReader,
}
}
if !curr_line.is_empty() {
trim_whitespace_prefix_and_push_line(&mut lines, curr_line, col);
trim_whitespace_prefix_and_push_line(&mut lines, curr_line, curr_col);
}
}

Expand Down Expand Up @@ -369,7 +369,7 @@ pub fn gather_comments_and_literals(span_diagnostic: &errors::Handler,
}


let bstart = rdr.last_pos;
let bstart = rdr.curr_pos;
rdr.next_token();
// discard, and look ahead; we're working with internal state
let TokenAndSpan { tok, sp } = rdr.peek();
Expand Down
Loading