bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: Fix complexity of string parsing. Closes #16624.

Browse source
This commit is contained in:
Brian Anderson 2014-08-21 15:47:37 -07:00
parent f92015f71b
commit bc7a85de29
2 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libsyntax/parse/mod.rs
View file

@ -412,14 +412,21 @@ pub fn str_lit(lit: &str) -> String {
loop { loop {
match chars.next() { match chars.next() {
Some((i, c)) => { Some((i, c)) => {
let em = error(i);
match c { match c {
'\\' => { '\\' => {
if chars.peek().expect(em.as_slice()).val1() == '\n' { let ch = chars.peek().unwrap_or_else(|| {
fail!("{}", error(i).as_slice())
}).val1();
if ch == '\n' {
eat(&mut chars); eat(&mut chars);
} else if chars.peek().expect(em.as_slice()).val1() == '\r' { } else if ch == '\r' {
chars.next(); chars.next();
if chars.peek().expect(em.as_slice()).val1() != '\n' { let ch = chars.peek().unwrap_or_else(|| {
fail!("{}", error(i).as_slice())
}).val1();
if ch != '\n' {
fail!("lexer accepted bare CR"); fail!("lexer accepted bare CR");
} }
eat(&mut chars); eat(&mut chars);
@ -433,7 +440,11 @@ pub fn str_lit(lit: &str) -> String {
} }
}, },
'\r' => { '\r' => {
if chars.peek().expect(em.as_slice()).val1() != '\n' { let ch = chars.peek().unwrap_or_else(|| {
fail!("{}", error(i).as_slice())
}).val1();
if ch != '\n' {
fail!("lexer accepted bare CR"); fail!("lexer accepted bare CR");
} }
chars.next(); chars.next();

15
src/test/run-pass/slowparse-string.rs Normal file
View file

File diff suppressed because one or more lines are too long