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

Allow delimiter quotes at the end of multiline strings (#393)

Browse source 
TOML allows (unlike many other formats) up to 2
additonal quotes that are part of the string:

basic = """2 extra quotes -->"""""
literal = '''here too ''''

Changed in TOML v1.0.0-rc.1

See also #392
This commit is contained in:
pyfisch 2020-05-28 17:39:55 +02:00 committed by GitHub
parent b84615a24c
commit af05f537d8
4 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tokens.rs
View file

@ -334,7 +334,7 @@ impl<'a> Tokenizer<'a> {
return Err(Error::NewlineInString(i));
}
}
Some((i, ch)) if ch == delim => {
Some((mut i, ch)) if ch == delim => {
if multiline {
if !self.eatc(delim) {
val.push(delim);
@ -345,6 +345,14 @@ impl<'a> Tokenizer<'a> {
val.push(delim);
continue 'outer;
}
if self.eatc(delim) {
val.push(delim);
i += 1;
}
if self.eatc(delim) {
val.push(delim);
i += 1;
}
}
return Ok(String {
src: &self.input[start..self.current()],

6
test-suite/tests/valid.rs
View file

@ -389,3 +389,9 @@ test!(
include_str!("valid/float-exponent.toml"),
include_str!("valid/float-exponent.json")
);
test!(
string_delim_end,
include_str!("valid/string-delim-end.toml"),
include_str!("valid/string-delim-end.json")
);

14
test-suite/tests/valid/string-delim-end.json Normal file
View file

@ -0,0 +1,14 @@
{
"str1": {
"type": "string",
"value": "\"This,\" she said, \"is just a pointless statement.\""
},
"str2": {
"type": "string",
"value": "foo''bar''"
},
"str3": {
"type": "string",
"value": "\"\""
}
}

3
test-suite/tests/valid/string-delim-end.toml Normal file
View file

@ -0,0 +1,3 @@
str1 = """"This," she said, "is just a pointless statement.""""
str2 = '''foo''bar'''''
str3 = """"""""