edg-l/teeint
1
0
Fork 0
mirror of https://github.com/edg-l/teeint.git synced 2024-10-18 06:53:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse source
This commit is contained in:
Edgar 2022-11-13 10:45:37 +01:00
parent 4343a4798f
commit bc577f5779
No known key found for this signature in database
GPG key ID: 70ADAE8F35904387
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "teeint" name = "teeint"
version = "0.1.0" version = "0.1.1"
edition = "2021" edition = "2021"
authors = ["Edgar <git@edgarluque.com>"] authors = ["Edgar <git@edgarluque.com>"]
description = "A teeworlds variable int packer/unpacker." description = "A teeworlds variable int packer/unpacker."

38
src/lib.rs
View file

@ -69,6 +69,9 @@
use std::io::{Read, Result, Write}; use std::io::{Read, Result, Write};
/// Max bytes packed in a variable int.
pub const MAX_BYTES_PACKED: usize = 5;
/// Pack a i32 into a teeworlds variable integer. /// Pack a i32 into a teeworlds variable integer.
pub fn pack<T: Write + ?Sized>(dst: &mut T, mut value: i32) -> Result<()> { pub fn pack<T: Write + ?Sized>(dst: &mut T, mut value: i32) -> Result<()> {
let mut current_byte: u8 = 0; let mut current_byte: u8 = 0;
@ -86,7 +89,7 @@ pub fn pack<T: Write + ?Sized>(dst: &mut T, mut value: i32) -> Result<()> {
} }
// First byte: Pack the remaining 6 bits // First byte: Pack the remaining 6 bits
current_byte |= (value & 0b0011_1111) as u8; current_byte |= value as u8 & 0b0011_1111;
value >>= 6; value >>= 6;
while value != 0 { while value != 0 {
@ -114,8 +117,8 @@ pub fn unpack<T: Read + ?Sized>(src: &mut T) -> Result<i32> {
let sign = (current_byte >> 6) & 1; let sign = (current_byte >> 6) & 1;
result = (current_byte & 0x3F) as i32; result = (current_byte & 0x3F) as i32;
const MASKS: [u8; 4] = [0x7F, 0x7F, 0x7F, 0x0F]; const MASKS: [i32; 4] = [0x7F, 0x7F, 0x7F, 0x0F];
const SHIFTS: [u8; 4] = [6, 6 + 7, 6 + 7 + 7, 6 + 7 + 7 + 7]; const SHIFTS: [i32; 4] = [6, 6 + 7, 6 + 7 + 7, 6 + 7 + 7 + 7];
for (mask, shift) in MASKS.into_iter().zip(SHIFTS.into_iter()) { for (mask, shift) in MASKS.into_iter().zip(SHIFTS.into_iter()) {
if (current_byte & 0x80) == 0 { if (current_byte & 0x80) == 0 {
@ -123,7 +126,7 @@ pub fn unpack<T: Read + ?Sized>(src: &mut T) -> Result<i32> {
} }
src.read_exact(std::slice::from_mut(&mut current_byte))?; src.read_exact(std::slice::from_mut(&mut current_byte))?;
result |= ((current_byte & mask) << shift) as i32; result |= (current_byte as i32 & mask) << shift;
} }
result ^= -(sign as i32); result ^= -(sign as i32);
@ -314,4 +317,31 @@ mod tests {
let result = buff.as_slice().unpack().unwrap(); let result = buff.as_slice().unpack().unwrap();
assert_eq!(result, 64); assert_eq!(result, 64);
} }
#[test]
pub fn roundtrip_256_trait() {
let mut buff = Cursor::new([0; MAX_BYTES_PACKED]);
256.pack(&mut buff).unwrap();
buff.set_position(0);
let result = buff.unpack().unwrap();
assert_eq!(256, result);
}
static DATA: [i32; 14] = [0, 1, -1, 32, 64, 256, -512, 12345, -123456, 1234567, 12345678, 123456789, 2147483647, (-2147483647 - 1)];
static SIZES: [u64; 14] = [1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5];
#[test]
pub fn roundtrip_pack_unpack() {
for i in 0..DATA.len() {
let mut buff = Cursor::new([0; MAX_BYTES_PACKED]);
DATA[i].pack(&mut buff).unwrap();
assert_eq!(buff.position(), SIZES[i]);
buff.set_position(0);
let result = buff.unpack().unwrap();
assert_eq!(buff.position(), SIZES[i]);
assert_eq!(DATA[i], result);
}
}
} }