diff --git a/src/value.rs b/src/value.rs index 8385fd9..f627659 100644 --- a/src/value.rs +++ b/src/value.rs @@ -37,6 +37,8 @@ pub enum Value<'a> { Ascii(Vec<&'a [u8]>), /// Vector of 16-bit unsigned integers. Short(Vec), + /// Vector of 32-bit unsigned integers. + Long(Vec), /// The type is unknown to this implementation. /// The associated values are the type and the count, and the /// offset of the "Value Offset" element. @@ -52,6 +54,7 @@ pub fn get_type_info<'a, E>(typecode: u16) 1 => (1, parse_byte), 2 => (1, parse_ascii), 3 => (2, parse_short::), + 4 => (4, parse_long::), _ => (0, parse_unknown), } } @@ -82,6 +85,15 @@ fn parse_short<'a, E>(data: &'a [u8], offset: usize, count: usize) Value::Short(val) } +fn parse_long<'a, E>(data: &'a [u8], offset: usize, count: usize) + -> Value<'a> where E: Endian { + let mut val = Vec::with_capacity(count); + for i in 0..count { + val.push(E::loadu32(data, offset + i * 4)); + } + Value::Long(val) +} + // This is a dummy function and will never be called. #[allow(unused_variables)] fn parse_unknown<'a>(data: &'a [u8], offset: usize, count: usize) @@ -146,4 +158,21 @@ mod tests { } } } + + #[test] + fn long() { + let sets: &[(&[u8], Vec)] = &[ + (b"x", vec![]), + (b"x\x01\x02\x03\x04\x05\x06\x07\x08", + vec![0x01020304, 0x05060708]), + ]; + let (unitlen, parser) = get_type_info::(4); + for &(data, ref ans) in sets { + assert!((data.len() - 1) % unitlen == 0); + match parser(data, 1, (data.len() - 1) / unitlen) { + Value::Long(v) => assert_eq!(v, *ans), + v => panic!("wrong variant {:?}", v), + } + } + } }