Merge pull request #75 from andersforsgren/allow-toml-BOM
Allow BOM (Byte order mark) in toml
This commit is contained in:
commit
67adf87dd4
|
@ -190,6 +190,14 @@ impl<'a> Parser<'a> {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Consumes a BOM (Byte Order Mark) if one is next
|
||||||
|
fn bom(&mut self) -> bool {
|
||||||
|
match self.peek(0) {
|
||||||
|
Some((_, '\u{feff}')) => { self.cur.next(); true }
|
||||||
|
_ => false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Consumes whitespace ('\t' and ' ') until another character (or EOF) is
|
// Consumes whitespace ('\t' and ' ') until another character (or EOF) is
|
||||||
// reached. Returns if any whitespace was consumed
|
// reached. Returns if any whitespace was consumed
|
||||||
fn ws(&mut self) -> bool {
|
fn ws(&mut self) -> bool {
|
||||||
|
@ -234,6 +242,7 @@ impl<'a> Parser<'a> {
|
||||||
/// to determine the cause of the parse failure.
|
/// to determine the cause of the parse failure.
|
||||||
pub fn parse(&mut self) -> Option<super::Table> {
|
pub fn parse(&mut self) -> Option<super::Table> {
|
||||||
let mut ret = TomlTable { values: BTreeMap::new(), defined: false };
|
let mut ret = TomlTable { values: BTreeMap::new(), defined: false };
|
||||||
|
self.bom();
|
||||||
while self.peek(0).is_some() {
|
while self.peek(0).is_some() {
|
||||||
self.ws();
|
self.ws();
|
||||||
if self.newline() { continue }
|
if self.newline() { continue }
|
||||||
|
|
|
@ -178,3 +178,6 @@ test!(example3,
|
||||||
test!(example4,
|
test!(example4,
|
||||||
include_str!("valid/example-v0.4.0.toml"),
|
include_str!("valid/example-v0.4.0.toml"),
|
||||||
include_str!("valid/example-v0.4.0.json"));
|
include_str!("valid/example-v0.4.0.json"));
|
||||||
|
test!(example_bom,
|
||||||
|
include_str!("valid/example-bom.toml"),
|
||||||
|
include_str!("valid/example.json"));
|
||||||
|
|
5
tests/valid/example-bom.toml
Normal file
5
tests/valid/example-bom.toml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
best-day-ever = 1987-07-05T17:45:00Z
|
||||||
|
|
||||||
|
[numtheory]
|
||||||
|
boring = false
|
||||||
|
perfection = [6, 28, 496]
|
Loading…
Reference in a new issue