openharmony/third_party_rust_nom
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_nom synced 2024-11-23 07:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #509 from sdroege/i24

Browse Source 
Various u24/i24 improvements, bugfixes, additions
This commit is contained in:
Geoffroy Couprie 2017-05-14 16:13:36 +02:00 committed by GitHub
commit e88b652a4b
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/nom.rs
View File

@ -359,10 +359,6 @@ pub fn be_u24(i: &[u8]) -> IResult<&[u8], u32> {
}
}
/// Recognizes big endian unsigned 4 bytes integer
#[inline]
pub fn be_u32(i: &[u8]) -> IResult<&[u8], u32> {
@ -398,6 +394,13 @@ pub fn be_i16(i:&[u8]) -> IResult<&[u8], i16> {
map!(i, be_u16, | x | { x as i16 })
}
/// Recognizes big endian signed 3 bytes integer
#[inline]
pub fn be_i24(i: &[u8]) -> IResult<&[u8], i32> {
// Same as the unsigned version but we need to sign-extend manually here
map!(i, be_u24, | x | if x & 0x80_00_00 != 0 { (x | 0xff_00_00_00) as i32 } else { x as i32 })
}
/// Recognizes big endian signed 4 bytes integer
#[inline]
pub fn be_i32(i:&[u8]) -> IResult<&[u8], i32> {
@ -431,13 +434,13 @@ pub fn le_u16(i: &[u8]) -> IResult<&[u8], u16> {
}
}
/// Recongnizes little endan unsigned 3 byte integer
/// Recognizes little endian unsigned 3 byte integer
#[inline]
pub fn le_u24(i: &[u8]) -> IResult<&[u8], u32> {
if i.len() < 3 {
Incomplete(Needed::Size(3))
} else {
let res = (i[0] as u32) + ((i[3] as u32) << 8) + ((i[2] as u32) << 16);
let res = (i[0] as u32) + ((i[1] as u32) << 8) + ((i[2] as u32) << 16);
Done(&i[3..], res)
}
}
@ -477,6 +480,13 @@ pub fn le_i16(i:&[u8]) -> IResult<&[u8], i16> {
map!(i, le_u16, | x | { x as i16 })
}
/// Recognizes little endian signed 3 bytes integer
#[inline]
pub fn le_i24(i: &[u8]) -> IResult<&[u8], i32> {
// Same as the unsigned version but we need to sign-extend manually here
map!(i, le_u24, | x | if x & 0x80_00_00 != 0 { (x | 0xff_00_00_00) as i32 } else { x as i32 })
}
/// Recognizes little endian signed 4 bytes integer
#[inline]
pub fn le_i32(i:&[u8]) -> IResult<&[u8], i32> {
@ -917,7 +927,7 @@ mod tests {
assert_eq!(be_i16(&[0xff, 0xff]), Done(&b""[..], -1));
assert_eq!(be_i16(&[0x80, 0x00]), Done(&b""[..], -32768_i16));
}
#[test]
fn u24_tests() {
assert_eq!(be_u24(&[0x00, 0x00, 0x00]), Done(&b""[..], 0));
@ -925,6 +935,13 @@ mod tests {
assert_eq!(be_u24(&[0x12, 0x34, 0x56]), Done(&b""[..], 1193046_u32));
}
#[test]
fn i24_tests() {
assert_eq!(be_i24(&[0xFF, 0xFF, 0xFF]), Done(&b""[..], -1_i32));
assert_eq!(be_i24(&[0xFF, 0x00, 0x00]), Done(&b""[..], -65536_i32));
assert_eq!(be_i24(&[0xED, 0xCB, 0xAA]), Done(&b""[..], -1193046_i32));
}
#[test]
fn i32_tests() {
assert_eq!(be_i32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0));
@ -957,6 +974,20 @@ mod tests {
assert_eq!(le_i16(&[0x00, 0x80]), Done(&b""[..], -32768_i16));
}
#[test]
fn le_u24_tests() {
assert_eq!(le_u24(&[0x00, 0x00, 0x00]), Done(&b""[..], 0));
assert_eq!(le_u24(&[0xFF, 0xFF, 0x00]), Done(&b""[..], 65535_u32));
assert_eq!(le_u24(&[0x56, 0x34, 0x12]), Done(&b""[..], 1193046_u32));
}
#[test]
fn le_i24_tests() {
assert_eq!(le_i24(&[0xFF, 0xFF, 0xFF]), Done(&b""[..], -1_i32));
assert_eq!(le_i24(&[0x00, 0x00, 0xFF]), Done(&b""[..], -65536_i32));
assert_eq!(le_i24(&[0xAA, 0xCB, 0xED]), Done(&b""[..], -1193046_i32));
}
#[test]
fn le_i32_tests() {
assert_eq!(le_i32(&[0x00, 0x00, 0x00, 0x00]), Done(&b""[..], 0));