|
@@ -45,8 +45,9 @@ fn integer<I>(input: I) -> ParseResult<i64, I>
|
|
Some('-') => -1,
|
|
Some('-') => -1,
|
|
_ => 1,
|
|
_ => 1,
|
|
});
|
|
});
|
|
- let hex =
|
|
|
|
- string("0x").with(many1(hex_digit())).map(|x: String| i64::from_str_radix(&x, 16).unwrap());
|
|
|
|
|
|
+ let hex = string("0x")
|
|
|
|
+ .with(many1(hex_digit()))
|
|
|
|
+ .map(|x: String| i64::from_str_radix(&x, 16).unwrap());
|
|
let dec = many1(digit()).map(|x: String| i64::from_str_radix(&x, 10).unwrap());
|
|
let dec = many1(digit()).map(|x: String| i64::from_str_radix(&x, 10).unwrap());
|
|
(sign, try(hex).or(dec)).map(|(s, x)| s * x).parse_stream(input)
|
|
(sign, try(hex).or(dec)).map(|(s, x)| s * x).parse_stream(input)
|
|
}
|
|
}
|