bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix token::Eof spans.

Browse source
This commit is contained in:
Jeffrey Seyfried 2017-02-21 12:04:45 +00:00
parent f6eaaf350e
commit a02c18aa52
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libsyntax/parse/parser.rs
View file

@ -223,7 +223,7 @@ impl TokenCursor {
self.frame = frame; self.frame = frame;
continue continue
} else { } else {
return TokenAndSpan { tok: token::Eof, sp: self.frame.span } return TokenAndSpan { tok: token::Eof, sp: syntax_pos::DUMMY_SP }
}; };
match tree { match tree {
@ -448,10 +448,14 @@ impl<'a> Parser<'a> {
} }
fn next_tok(&mut self) -> TokenAndSpan { fn next_tok(&mut self) -> TokenAndSpan {
match self.desugar_doc_comments { let mut next = match self.desugar_doc_comments {
true => self.token_cursor.next_desugared(), true => self.token_cursor.next_desugared(),
false => self.token_cursor.next(), false => self.token_cursor.next(),
};
if next.sp == syntax_pos::DUMMY_SP {
next.sp = self.prev_span;
} }
next
} }
/// Convert a token to a string using self's reader /// Convert a token to a string using self's reader