demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

var_bit improvements

Browse source
This commit is contained in:
Robin Appelman 2022-05-25 20:39:24 +02:00
commit 67d08f06da
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/allprops.rs
View file

@ -10,6 +10,7 @@ use tf_demo_parser::MessageType;
pub use tf_demo_parser::{Demo, DemoParser, Parse, ParseError, ParserState, Stream}; pub use tf_demo_parser::{Demo, DemoParser, Parse, ParseError, ParserState, Stream};
fn main() -> Result<(), MainError> { fn main() -> Result<(), MainError> {
#[cfg(feature = "trace")]
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();
let args: Vec<_> = env::args().collect(); let args: Vec<_> = env::args().collect();

31
src/demo/message/packetentities.rs
View file

@ -11,7 +11,6 @@ use parse_display::{Display, FromStr};
use std::cmp::{min, Ordering}; use std::cmp::{min, Ordering};
use std::fmt; use std::fmt;
use std::hint::unreachable_unchecked;
use std::num::NonZeroU32; use std::num::NonZeroU32;
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
@ -145,32 +144,23 @@ fn read_bit_var<'a, T: BitReadSized<'a, LittleEndian>>(stream: &mut Stream<'a>)
0 => 4, 0 => 4,
1 => 8, 1 => 8,
2 => 12, 2 => 12,
3 => 32, _ => 32,
_ => unsafe { unreachable_unchecked() },
}; };
stream.read_sized(bits) stream.read_sized(bits)
} }
fn write_bit_var(var: u32, stream: &mut BitWriteStream<LittleEndian>) -> ReadResult<()> { fn write_bit_var(var: u32, stream: &mut BitWriteStream<LittleEndian>) -> ReadResult<()> {
let ty: u8 = if var >= 2u32.pow(12) { let (ty, bits): (u8, usize) = if var >= 2u32.pow(12) {
3 (3, 32)
} else if var >= 2u32.pow(8) { } else if var >= 2u32.pow(8) {
2 (2, 12)
} else if var >= 2u32.pow(4) { } else if var >= 2u32.pow(4) {
1 (1, 8)
} else { } else {
0 (0, 4)
}; };
ty.write_sized(stream, 2)?; ty.write_sized(stream, 2)?;
let bits = match ty {
0 => 4,
1 => 8,
2 => 12,
3 => 32,
_ => unsafe { unreachable_unchecked() },
};
var.write_sized(stream, bits) var.write_sized(stream, bits)
} }
@ -198,6 +188,13 @@ fn test_bit_var_roundtrip() {
bit_var_normal(1234567); bit_var_normal(1234567);
bit_var_normal(12345678); bit_var_normal(12345678);
bit_var_normal(123456789); bit_var_normal(123456789);
bit_var_normal(u32::MAX);
for i in 0..31 {
bit_var_normal(2u32.pow(i) as u32);
bit_var_normal(2u32.pow(i) as u32 - 1);
bit_var_normal(2u32.pow(i) as u32 + 1);
}
} }
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]