Disallow leading 0s in integers/floats

This commit is contained in:
Alex Crichton 2015-01-15 15:36:54 -08:00
parent f4b2045de0
commit f098d70145

View file

@ -466,9 +466,22 @@ impl<'a> Parser<'a> {
fn number_or_datetime(&mut self, mut start: usize) -> Option<Value> { fn number_or_datetime(&mut self, mut start: usize) -> Option<Value> {
let sign = if self.eat('+') { start += 1; true } else {self.eat('-')}; let sign = if self.eat('+') { start += 1; true } else {self.eat('-')};
let mut is_float = false; let mut is_float = false;
if self.eat('0') {
match self.peek(0) {
Some((pos, c)) if '0' <= c && c <= '9' => {
self.errors.push(ParserError {
lo: start,
hi: pos,
desc: format!("leading zeroes are not allowed"),
});
return None
}
_ => {}
}
}
loop { loop {
match self.cur.clone().next() { match self.cur.clone().next() {
Some((_, ch)) if ch.is_digit(10) => { self.cur.next(); } Some((_, ch)) if '0' <= ch && ch <= '9' => { self.cur.next(); }
Some((_, '.')) if !is_float => { Some((_, '.')) if !is_float => {
is_float = true; is_float = true;
self.cur.next(); self.cur.next();
@ -983,4 +996,16 @@ trimmed in raw strings.
assert!(Parser::new("a = \"\n\"").parse().is_none()); assert!(Parser::new("a = \"\n\"").parse().is_none());
assert!(Parser::new("a = '\n'").parse().is_none()); assert!(Parser::new("a = '\n'").parse().is_none());
} }
#[test]
fn bad_leading_zeros() {
assert!(Parser::new("a = 00").parse().is_none());
assert!(Parser::new("a = -00").parse().is_none());
assert!(Parser::new("a = +00").parse().is_none());
assert!(Parser::new("a = 00.0").parse().is_none());
assert!(Parser::new("a = -00.0").parse().is_none());
assert!(Parser::new("a = +00.0").parse().is_none());
assert!(Parser::new("a = 9223372036854775808").parse().is_none());
assert!(Parser::new("a = -9223372036854775809").parse().is_none());
}
} }