Skip to content

Primitive integer128 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethanfrey merged 4 commits into from
Nov 17, 2021
Merged

Primitive integer128 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30d01e8
add serializer for i128 and u128
loloicci Nov 16, 2021
152b3a6
add deserializer for i128 and u128
loloicci Nov 16, 2021
b6e1f47
remove serde_if_integer128
loloicci Nov 16, 2021
cf5fd57
remove or-patterns in pattern match
loloicci Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 97 additions & 2 deletions src/de/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,10 @@ macro_rules! deserialize_unsigned {
.checked_add((c - b'0') as $uxx)
.ok_or(Error::InvalidNumber)?;
}
_ => return $visitor.$visit_uxx(number),
_ => break,
}
}
$visitor.$visit_uxx(number)
}
_ => Err(Error::InvalidType),
}
Expand Down Expand Up @@ -235,9 +236,10 @@ macro_rules! deserialize_signed {
.checked_add((c - b'0') as $ixx * if signed { -1 } else { 1 })
.ok_or(Error::InvalidNumber)?;
}
_ => return $visitor.$visit_ixx(number),
_ => break,
}
}
$visitor.$visit_ixx(number)
}
_ => return Err(Error::InvalidType),
}
Expand Down Expand Up @@ -308,6 +310,31 @@ impl<'a, 'de> de::Deserializer<'de> for &'a mut Deserializer<'de> {
deserialize_signed!(self, visitor, i64, visit_i64)
}

fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
match self.parse_whitespace().ok_or(Error::EofWhileParsingValue)? {
b'"' => self.eat_char(),
_ => return Err(Error::InvalidType),
};

let result = match self.peek() {
// after rust merged or-patterns feature, these two clause can be merged.
// error[E0658]: or-patterns syntax is experimental
Some(b'0'..=b'9') => deserialize_signed!(self, visitor, i128, visit_i128),
Some(b'-') => deserialize_signed!(self, visitor, i128, visit_i128),
_ => return Err(Error::InvalidType),
};
match self.peek() {
Some(b'"') => {
self.eat_char();
result
}
_ => Err(Error::InvalidType),
}
}

fn deserialize_u8<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
Expand Down Expand Up @@ -336,6 +363,31 @@ impl<'a, 'de> de::Deserializer<'de> for &'a mut Deserializer<'de> {
deserialize_unsigned!(self, visitor, u64, visit_u64)
}

fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
match self.parse_whitespace().ok_or(Error::EofWhileParsingValue)? {
b'"' => {
self.eat_char();
}
_ => return Err(Error::InvalidType),
};

let result = match self.peek() {
Some(b'-') => return Err(Error::InvalidNumber),
Some(b'0'..=b'9') => deserialize_unsigned!(self, visitor, u128, visit_u128),
_ => return Err(Error::InvalidType),
};
match self.peek() {
Some(b'"') => {
self.eat_char();
result
}
_ => Err(Error::InvalidType),
}
}

fn deserialize_f32<V>(self, _visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
Expand Down Expand Up @@ -660,6 +712,49 @@ mod tests {
assert_eq!(from_str("[4,5]\r\n"), Ok([4, 5]));
}

#[test]
fn integer128() {
assert_eq!(from_str::<i128>(r#"0"#), Err(crate::de::Error::InvalidType));
assert_eq!(from_str::<i128>(r#""0""#), Ok(0));
assert_eq!(from_str::<i128>(r#""1""#), Ok(1));
assert_eq!(from_str::<i128>(r#""-1""#), Ok(-1));
// max i128
assert_eq!(
from_str::<i128>(r#""170141183460469231731687303715884105727""#),
Ok(170141183460469231731687303715884105727)
);
assert_eq!(
from_str::<i128>(r#""170141183460469231731687303715884105728""#),
Err(crate::de::Error::InvalidNumber)
);
// min i128
assert_eq!(
from_str::<i128>(r#""-170141183460469231731687303715884105728""#),
Ok(-170141183460469231731687303715884105728)
);
assert_eq!(
from_str::<i128>(r#""-170141183460469231731687303715884105729""#),
Err(crate::de::Error::InvalidNumber)
);

assert_eq!(from_str::<u128>(r#"0"#), Err(crate::de::Error::InvalidType));
assert_eq!(from_str::<u128>(r#""0""#), Ok(0));
assert_eq!(from_str::<u128>(r#""1""#), Ok(1));
assert_eq!(
from_str::<u128>(r#""-1""#),
Err(crate::de::Error::InvalidNumber)
);
// max u128
assert_eq!(
from_str::<u128>(r#""340282366920938463463374607431768211455""#),
Ok(340282366920938463463374607431768211455)
);
assert_eq!(
from_str::<u128>(r#""340282366920938463463374607431768211456""#),
Err(crate::de::Error::InvalidNumber)
)
}

#[test]
fn array() {
assert_eq!(from_str::<[i32; 0]>("[]"), Ok([]));
Expand Down
75 changes: 75 additions & 0 deletions src/ser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,15 @@ impl<'a> ser::Serializer for &'a mut Serializer {
serialize_signed!(self, 20, v, i64, u64)
}

fn serialize_i128(self, v: i128) -> Result<Self::Ok> {
// -170141183460469231731687303715884105728
let res: Result<Self::Ok> = serialize_signed!(self, 40, v, i128, u128);
res?;
self.buf.insert(0, b'"');
self.buf.push(b'"');
Ok(())
}

fn serialize_u8(self, v: u8) -> Result<Self::Ok> {
// 255
serialize_unsigned!(self, 3, v)
Expand All @@ -206,6 +215,15 @@ impl<'a> ser::Serializer for &'a mut Serializer {
serialize_unsigned!(self, 20, v)
}

fn serialize_u128(self, v: u128) -> Result<Self::Ok> {
// 340282366920938463463374607431768211455
let res: Result<Self::Ok> = serialize_unsigned!(self, 39, v);
res?;
self.buf.insert(0, b'"');
self.buf.push(b'"');
Ok(())
}

fn serialize_f32(self, _v: f32) -> Result<Self::Ok> {
unreachable!()
}
Expand Down Expand Up @@ -597,6 +615,63 @@ mod tests {
to_string::<i64>(&std::i64::MIN).unwrap(),
"-9223372036854775808"
);

assert_eq!(to_string::<u128>(&0).unwrap(), r#""0""#);
assert_eq!(to_string::<u128>(&1).unwrap(), r#""1""#);
assert_eq!(to_string::<u128>(&456789).unwrap(), r#""456789""#);
assert_eq!(to_string::<u128>(&4294967295).unwrap(), r#""4294967295""#);
assert_eq!(to_string::<u128>(&4294967296).unwrap(), r#""4294967296""#);
assert_eq!(
to_string::<u128>(&9007199254740991).unwrap(),
r#""9007199254740991""#
); // Number.MAX_SAFE_INTEGER
assert_eq!(
to_string::<u128>(&9007199254740992).unwrap(),
r#""9007199254740992""#
); // Number.MAX_SAFE_INTEGER+1
assert_eq!(
to_string::<u128>(&9223372036854775807).unwrap(),
r#""9223372036854775807""#
);
assert_eq!(
to_string::<u128>(&9223372036854775808).unwrap(),
r#""9223372036854775808""#
);
assert_eq!(
to_string::<u128>(&std::u128::MAX).unwrap(),
r#""340282366920938463463374607431768211455""#
);

assert_eq!(to_string::<i128>(&0).unwrap(), r#""0""#);
assert_eq!(to_string::<i128>(&1).unwrap(), r#""1""#);
assert_eq!(to_string::<i128>(&456789).unwrap(), r#""456789""#);
assert_eq!(to_string::<i128>(&4294967295).unwrap(), r#""4294967295""#);
assert_eq!(to_string::<i128>(&4294967296).unwrap(), r#""4294967296""#);
assert_eq!(
to_string::<i128>(&9007199254740991).unwrap(),
r#""9007199254740991""#
); // Number.MAX_SAFE_INTEGER
assert_eq!(
to_string::<i128>(&9007199254740992).unwrap(),
r#""9007199254740992""#
); // Number.MAX_SAFE_INTEGER+1
assert_eq!(
to_string::<i128>(&9223372036854775807).unwrap(),
r#""9223372036854775807""#
);
assert_eq!(
to_string::<i128>(&9223372036854775808).unwrap(),
r#""9223372036854775808""#
);
assert_eq!(
to_string::<i128>(&std::i128::MAX).unwrap(),
r#""170141183460469231731687303715884105727""#
);
assert_eq!(to_string::<i128>(&-1).unwrap(), r#""-1""#);
assert_eq!(
to_string::<i128>(&std::i128::MIN).unwrap(),
r#""-170141183460469231731687303715884105728""#
);
}

#[test]
Expand Down