Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-09-09 02:55:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

types(string): integer values can be specified with hexadecimal notation

Browse Source
This commit is contained in:
Matt Bilker
2019-10-24 17:53:52 +00:00
parent 1b1f55f6d4
commit 8be89649f3
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/types/string.rs
View File

@@ -66,7 +66,7 @@ impl FromKbinString for Ipv4Addr {
}
}
macro_rules! basic_parse {
macro_rules! basic_int_parse {
(
$($type:ty),*$(,)?
) => {
@@ -75,7 +75,33 @@ macro_rules! basic_parse {
fn from_kbin_string(input: &str) -> Result<Self, KbinError> {
space_check(input)?;
input.parse::<$type>().context(KbinErrorKind::StringParse(stringify!($type))).map_err(Into::into)
if input.starts_with("0x") {
<$type>::from_str_radix(&input[2..], 16)
.context(KbinErrorKind::StringParse(stringify!($type)))
.map_err(Into::into)
} else {
input.parse::<$type>()
.context(KbinErrorKind::StringParse(stringify!($type)))
.map_err(Into::into)
}
}
}
)*
};
}
macro_rules! basic_float_parse {
(
$($type:ty),*$(,)?
) => {
$(
impl FromKbinString for $type {
fn from_kbin_string(input: &str) -> Result<Self, KbinError> {
space_check(input)?;
input.parse::<$type>()
.context(KbinErrorKind::StringParse(stringify!($type)))
.map_err(Into::into)
}
}
)*
@@ -124,11 +150,14 @@ macro_rules! tuple_parse {
};
}
basic_parse! {
basic_int_parse! {
i8, u8,
i16, u16,
i32, u32,
i64, u64,
}
basic_float_parse! {
f32, f64,
}