diff options
| author | bors <bors@rust-lang.org> | 2013-08-10 16:32:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-10 16:32:18 -0700 |
| commit | bf809768ee8ff3ea4ef434721ff82b09a4df261a (patch) | |
| tree | f7492e25ff06c4eeb3d1e480f641344b306c4247 /src/libsyntax/parse/lexer.rs | |
| parent | 8b9e1ce75a3e1416f2db80d30f65879fd902183f (diff) | |
| parent | 20953bb1fbfafc3839e739f38ddf7d495eb1fe8b (diff) | |
auto merge of #8444 : erickt/rust/rollup, r=cmr
This merges these PR together: #8430: r=thestinger #8370: r=thestinger #8386: r=bstrie #8388: r=thestinger #8390: r=graydon #8394: r=graydon #8402: r=thestinger #8403: r=catamorphism
Diffstat (limited to 'src/libsyntax/parse/lexer.rs')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 49deafeda40..bde568b2610 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -129,7 +129,11 @@ impl reader for StringReader { impl reader for TtReader { fn is_eof(@mut self) -> bool { self.cur_tok == token::EOF } - fn next_token(@mut self) -> TokenAndSpan { tt_next_token(self) } + fn next_token(@mut self) -> TokenAndSpan { + let r = tt_next_token(self); + debug!("TtReader: r=%?", r); + return r; + } fn fatal(@mut self, m: ~str) -> ! { self.sp_diag.span_fatal(self.cur_span, m); } |