asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #268 from jmhain/allow-ws-after-bs

Browse source 
Allow whitespace after line ending backslash (#162)
This commit is contained in:
Alex Crichton 2018-10-29 09:47:56 -07:00 committed by GitHub
parent 2623d4c60d a9fb3bf188
commit 14f8934bef
4 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/tokens.rs
View file

@ -364,7 +364,24 @@ impl<'a> Tokenizer<'a> {
let len = if c == 'u' {4} else {8};
val.push(me.hex(start, i, len)?);
}
Some((_, '\n')) if multi => {
Some((i, c @ ' ')) |
Some((i, c @ '\t')) |
Some((i, c @ '\n')) if multi => {
if c != '\n' {
while let Some((_, ch)) = me.chars.clone().next() {
match ch {
' ' | '\t' => {
me.chars.next();
continue
},
'\n' => {
me.chars.next();
break
},
_ => return Err(Error::InvalidEscape(i, c)),
}
}
}
while let Some((_, ch)) = me.chars.clone().next() {
match ch {
' ' | '\t' | '\n' => {

3
test-suite/tests/invalid/string-bad-line-ending-escape.toml Normal file
View file

@ -0,0 +1,3 @@
invalid-escape = """\
This string has a non whitespace-character after the line ending escape. \ a
"""

8
test-suite/tests/valid/multiline-string.json
View file

@ -15,6 +15,10 @@
"type": "string",
"value": ""
},
"multiline_empty_five": {
"type": "string",
"value": ""
},
"equivalent_one": {
"type": "string",
"value": "The quick brown fox jumps over the lazy dog."
@ -26,5 +30,9 @@
"equivalent_three": {
"type": "string",
"value": "The quick brown fox jumps over the lazy dog."
},
"equivalent_four": {
"type": "string",
"value": "The quick brown fox jumps over the lazy dog."
}
}

11
test-suite/tests/valid/multiline-string.toml
View file

@ -7,6 +7,11 @@ multiline_empty_four = """\
\
\
"""
multiline_empty_five = """\
\
\
\
"""
equivalent_one = "The quick brown fox jumps over the lazy dog."
equivalent_two = """
@ -21,3 +26,9 @@ equivalent_three = """\
fox jumps over \
the lazy dog.\
"""
equivalent_four = """\
The quick brown \
fox jumps over \
the lazy dog.\
"""