Skip to content

Commit e38b1bd

Browse files
committed
add NumberAny::from_bytes, tests
1 parent 5e4c945 commit e38b1bd

File tree

2 files changed

+30
-11
lines changed

2 files changed

+30
-11
lines changed

crates/jiter/src/number_decoder.rs

+9-11
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,16 @@ impl TryFrom<&[u8]> for NumberAny {
143143
type Error = JsonError;
144144

145145
fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
146-
let first = *value.first().ok_or_else(|| json_error!(InvalidNumber, 0))?;
147-
let (int_parse, index) = IntParse::parse(value, 0, first)?;
148-
let (number, index) = match int_parse {
149-
IntParse::Int(int) => (Self::Int(int), index),
150-
IntParse::Float => {
151-
let (f, index) = NumberFloat::decode(value, 0, first, false)?;
152-
(Self::Float(f), index)
153-
}
154-
_ => return json_err!(InvalidNumber, index),
155-
};
146+
Self::from_bytes(value, false)
147+
}
148+
}
149+
150+
impl NumberAny {
151+
pub fn from_bytes(data: &[u8], allow_inf_nan: bool) -> Result<Self, JsonError> {
152+
let first = *data.first().ok_or_else(|| json_error!(InvalidNumber, 0))?;
153+
let (number, index) = Self::decode(data, 0, first, allow_inf_nan)?;
156154

157-
if index == value.len() {
155+
if index == data.len() {
158156
Ok(number)
159157
} else {
160158
json_err!(InvalidNumber, index)

crates/jiter/tests/main.rs

+21
Original file line numberDiff line numberDiff line change
@@ -1467,11 +1467,32 @@ fn test_number_any_try_from_bytes() {
14671467
let e = NumberAny::try_from(b"0123".as_ref()).unwrap_err();
14681468
assert_eq!(e.to_string(), "invalid number at index 1");
14691469

1470+
let e = NumberAny::try_from(b"NaN".as_ref()).unwrap_err();
1471+
assert_eq!(e.to_string(), "expected value at index 0");
1472+
14701473
let too_long = "9".repeat(4309);
14711474
let e = NumberAny::try_from(too_long.as_bytes()).unwrap_err();
14721475
assert_eq!(e.to_string(), "number out of range at index 4301");
14731476
}
14741477

1478+
#[test]
1479+
fn test_number_any_try_from_bytes_allow() {
1480+
let n = NumberAny::from_bytes(b"123", true).unwrap();
1481+
assert_eq!(n, NumberAny::Int(NumberInt::Int(123)));
1482+
1483+
let e = NumberAny::from_bytes(b"x23", true).unwrap_err();
1484+
assert_eq!(e.to_string(), "invalid number at index 0");
1485+
1486+
let n = NumberAny::from_bytes(b"NaN", true).unwrap();
1487+
assert_eq!(format!("{n:?}"), "Float(NaN)");
1488+
1489+
let n = NumberAny::from_bytes(b"Infinity", true).unwrap();
1490+
assert_eq!(format!("{n:?}"), "Float(inf)");
1491+
1492+
let e = NumberAny::from_bytes(b"NaN", false).unwrap_err();
1493+
assert_eq!(e.to_string(), "expected value at index 0");
1494+
}
1495+
14751496
#[test]
14761497
fn jiter_skip_whole_object() {
14771498
let mut jiter = Jiter::new(br#"{"x": 1}"#);

0 commit comments

Comments
 (0)