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

Require newlines to be present after keys

Browse source 
Closes #100
This commit is contained in:
Alex Crichton 2016-05-22 23:30:43 -07:00
parent 97592e120f
commit 44fc9d9f37
1 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/parser.rs
View file

@ -398,10 +398,20 @@ impl<'a> Parser<'a> {
Some(value) => value, Some(value) => value,
None => return false, None => return false,
}; };
let end = self.next_pos();
self.insert(into, key, value, key_lo); self.insert(into, key, value, key_lo);
self.ws(); self.ws();
self.comment(); if !self.comment() && !self.newline() {
self.newline(); if self.peek(0).is_none() {
return true
}
self.errors.push(ParserError {
lo: key_lo,
hi: end,
desc: format!("expected a newline after a key"),
});
return false
}
} }
true true
} }
@ -1591,4 +1601,27 @@ trimmed in raw strings.
bad!("foo = 2016-09-09T09:09:09-2:00", "malformed date literal"); bad!("foo = 2016-09-09T09:09:09-2:00", "malformed date literal");
bad!("foo = 2016-09-09T09:09:09Z-2:00", "expected"); bad!("foo = 2016-09-09T09:09:09Z-2:00", "expected");
} }
#[test]
fn require_newline_after_value() {
bad!("0=0r=false", "expected a newline");
bad!(r#"
0=""o=""m=""r=""00="0"q="""0"""e="""0"""
"#, "expected a newline");
bad!(r#"
[[0000l0]]
0="0"[[0000l0]]
0="0"[[0000l0]]
0="0"l="0"
"#, "expected a newline");
bad!(r#"
0=[0]00=[0,0,0]t=["0","0","0"]s=[1000-00-00T00:00:00Z,2000-00-00T00:00:00Z]
"#, "expected a newline");
bad!(r#"
0=0r0=0r=false
"#, "expected a newline");
bad!(r#"
0=0r0=0r=falsefal=false
"#, "expected a newline");
}
} }