diff options
| author | bors <bors@rust-lang.org> | 2013-09-18 00:15:55 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-18 00:15:55 -0700 |
| commit | 7dd9344b0359d1ee63bf6b3c01e6c0c209602e5d (patch) | |
| tree | 27412fe1ce0034983442ad5f5fb91abf3aee7cf1 /src/libsyntax/parse | |
| parent | cbd1eefbd350797b783df119fed7956d7e1c74ad (diff) | |
| parent | 604667fa82f72309ee692c77086e22766cc3a8ee (diff) | |
| download | rust-7dd9344b0359d1ee63bf6b3c01e6c0c209602e5d.tar.gz rust-7dd9344b0359d1ee63bf6b3c01e6c0c209602e5d.zip | |
auto merge of #9248 : DanRosenwasser/rust/master, r=alexcrichton
Since `
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index c267a673fce..0bc9e619274 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -699,6 +699,7 @@ fn next_token_inner(rdr: @mut StringReader) -> token::Token { '\\' => { c2 = '\\'; } '\'' => { c2 = '\''; } '"' => { c2 = '"'; } + '0' => { c2 = '\x00'; } 'x' => { c2 = scan_numeric_escape(rdr, 2u); } 'u' => { c2 = scan_numeric_escape(rdr, 4u); } 'U' => { c2 = scan_numeric_escape(rdr, 8u); } @@ -738,6 +739,7 @@ fn next_token_inner(rdr: @mut StringReader) -> token::Token { '\'' => accum_str.push_char('\''), '"' => accum_str.push_char('"'), '\n' => consume_whitespace(rdr), + '0' => accum_str.push_char('\x00'), 'x' => { accum_str.push_char(scan_numeric_escape(rdr, 2u)); } |