mirror of
https://codeberg.org/icewind/bitbuffer.git
synced 2026-06-03 16:44:06 +02:00
allow creating a writestream from a slice
This commit is contained in:
parent
f6fb6c6f64
commit
b096c70061
3 changed files with 134 additions and 2 deletions
|
|
@ -1,10 +1,99 @@
|
|||
use crate::Endianness;
|
||||
use std::cmp::min;
|
||||
use std::marker::PhantomData;
|
||||
use std::ops::{Index, IndexMut, Range};
|
||||
|
||||
enum WriteData<'a> {
|
||||
Vec(&'a mut Vec<u8>),
|
||||
Slice { data: &'a mut [u8], length: usize },
|
||||
}
|
||||
|
||||
impl<'a> WriteData<'a> {
|
||||
fn pop(&mut self) -> Option<u8> {
|
||||
match self {
|
||||
WriteData::Vec(vec) => vec.pop(),
|
||||
WriteData::Slice { data, length } if *length > 0 => {
|
||||
*length -= 1;
|
||||
Some(data[*length])
|
||||
}
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn extend_from_slice(&mut self, other: &[u8]) {
|
||||
match self {
|
||||
WriteData::Vec(vec) => vec.extend_from_slice(other),
|
||||
WriteData::Slice { data, length } => {
|
||||
let end = *length + other.len();
|
||||
let target = &mut data[*length..end];
|
||||
target.copy_from_slice(other);
|
||||
*length += other.len();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn push(&mut self, byte: u8) {
|
||||
match self {
|
||||
WriteData::Vec(vec) => vec.push(byte),
|
||||
WriteData::Slice { data, length } => {
|
||||
data[*length] = byte;
|
||||
*length += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn last_mut(&mut self) -> Option<&mut u8> {
|
||||
match self {
|
||||
WriteData::Vec(vec) => vec.last_mut(),
|
||||
WriteData::Slice { data, length } if *length > 0 => Some(&mut data[*length]),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Index<usize> for WriteData<'a> {
|
||||
type Output = u8;
|
||||
|
||||
fn index(&self, index: usize) -> &Self::Output {
|
||||
match self {
|
||||
WriteData::Vec(vec) => &vec[index],
|
||||
WriteData::Slice { data, .. } => &data[index],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IndexMut<usize> for WriteData<'a> {
|
||||
fn index_mut(&mut self, index: usize) -> &mut Self::Output {
|
||||
match self {
|
||||
WriteData::Vec(vec) => &mut vec[index],
|
||||
WriteData::Slice { data, .. } => &mut data[index],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Index<Range<usize>> for WriteData<'a> {
|
||||
type Output = [u8];
|
||||
|
||||
fn index(&self, index: Range<usize>) -> &Self::Output {
|
||||
match self {
|
||||
WriteData::Vec(vec) => &vec[index],
|
||||
WriteData::Slice { data, .. } => &data[index],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IndexMut<Range<usize>> for WriteData<'a> {
|
||||
fn index_mut(&mut self, index: Range<usize>) -> &mut Self::Output {
|
||||
match self {
|
||||
WriteData::Vec(vec) => &mut vec[index],
|
||||
WriteData::Slice { data, .. } => &mut data[index],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct WriteBuffer<'a, E: Endianness> {
|
||||
bit_len: usize,
|
||||
bytes: &'a mut Vec<u8>,
|
||||
bytes: WriteData<'a>,
|
||||
endianness: PhantomData<E>,
|
||||
}
|
||||
|
||||
|
|
@ -12,7 +101,17 @@ impl<'a, E: Endianness> WriteBuffer<'a, E> {
|
|||
pub fn new(bytes: &'a mut Vec<u8>, _endianness: E) -> Self {
|
||||
WriteBuffer {
|
||||
bit_len: 0,
|
||||
bytes,
|
||||
bytes: WriteData::Vec(bytes),
|
||||
endianness: PhantomData,
|
||||
}
|
||||
}
|
||||
pub fn for_slice(bytes: &'a mut [u8], _endianness: E) -> Self {
|
||||
WriteBuffer {
|
||||
bit_len: 0,
|
||||
bytes: WriteData::Slice {
|
||||
data: bytes,
|
||||
length: 0,
|
||||
},
|
||||
endianness: PhantomData,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,16 @@ where
|
|||
buffer: WriteBuffer::new(data, endianness),
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a new write stream
|
||||
///
|
||||
/// Note that the resulting stream will panic when trying to write more data then fits
|
||||
/// in the provided slice.
|
||||
pub fn from_slice(data: &'a mut [u8], endianness: E) -> Self {
|
||||
BitWriteStream {
|
||||
buffer: WriteBuffer::for_slice(data, endianness),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, E> BitWriteStream<'a, E>
|
||||
|
|
|
|||
|
|
@ -204,3 +204,26 @@ fn test_write_container() {
|
|||
assert_eq!(Rc::new(true), read.read().unwrap());
|
||||
assert_eq!(Arc::new(true), read.read().unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_write_to_slice() {
|
||||
let mut data = [0; 32];
|
||||
{
|
||||
let mut stream = BitWriteStream::from_slice(&mut data[..], LittleEndian);
|
||||
|
||||
stream.write_bool(true).unwrap();
|
||||
stream.write_int(3253u16, 16).unwrap();
|
||||
stream.write_int(13253u64, 64).unwrap();
|
||||
}
|
||||
|
||||
dbg!(&data);
|
||||
|
||||
let mut read = BitReadStream::from(BitReadBuffer::new(&data[..], LittleEndian));
|
||||
|
||||
assert_eq!(true, read.read_bool().unwrap());
|
||||
assert_eq!(3253u16, read.read::<u16>().unwrap());
|
||||
assert_eq!(13253u64, read.read::<u64>().unwrap());
|
||||
|
||||
// 0 padded
|
||||
assert_eq!(false, read.read_bool().unwrap());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue