Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-04-25 15:42:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

node_types: make StandardType like C-style enum

Browse Source
This commit is contained in:
Matt Bilker 2019-07-06 19:28:37 +00:00
parent 864ed02ce4
commit 6733675238
No known key found for this signature in database
GPG Key ID: 69ADF8AEB6C8B5D1
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/error.rs
View File

@ -136,7 +136,7 @@ impl fmt::Display for KbinError {
}
impl Fail for KbinError {
fn cause(&self) -> Option<&Fail> {
fn cause(&self) -> Option<&dyn Fail> {
self.inner.cause()
}

2
src/node_types.rs
View File

@ -26,7 +26,7 @@ macro_rules! construct_types {
#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
pub enum StandardType {
$(
$konst,
$konst = $id,
)+
}

29
src/writer.rs
View File

@ -34,8 +34,7 @@ fn write_value(options: &Options, data_buf: &mut ByteBufferWrite, node_type: Sta
return Err(KbinErrorKind::InvalidState.into());
}
let count = values.len();
let total_size = count * node_type.count * node_type.size;
let total_size = values.len() * node_type.count * node_type.size;
let mut data = Vec::with_capacity(total_size);
for value in values {
@ -97,7 +96,7 @@ impl Writeable for Element {
array_mask,
count);
node_buf.write_u8(node_type.id | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
node_buf.write_u8(node_type as u8 | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
match options.compression {
Compression::Compressed => Sixbit::pack(&mut **node_buf, self.name())?,
Compression::Uncompressed => {
@ -150,7 +149,7 @@ impl Writeable for Element {
data_buf.write_str(options.encoding, value)?;
let node_type = StandardType::Attribute;
node_buf.write_u8(node_type.id).context(KbinErrorKind::DataWrite(node_type.name))?;
node_buf.write_u8(node_type as u8).context(KbinErrorKind::DataWrite(node_type.name))?;
match options.compression {
Compression::Compressed => Sixbit::pack(&mut **node_buf, key)?,
Compression::Uncompressed => {
@ -166,8 +165,8 @@ impl Writeable for Element {
child.write_node(options, node_buf, data_buf)?;
}
// Always has the array bit set
node_buf.write_u8(StandardType::NodeEnd.id | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
// node end always has the array bit set
node_buf.write_u8(StandardType::NodeEnd as u8 | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
Ok(())
}
@ -186,7 +185,7 @@ impl Writeable for NodeCollection {
node_type.count,
is_array);
node_buf.write_u8(node_type.id | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
node_buf.write_u8(node_type as u8 | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
match options.compression {
Compression::Compressed => Sixbit::pack(&mut **node_buf, &name)?,
Compression::Uncompressed => {
@ -210,7 +209,7 @@ impl Writeable for NodeCollection {
data_buf.buf_write(value)?;
node_buf.write_u8(StandardType::Attribute.id).context(KbinErrorKind::DataWrite(StandardType::Attribute.name))?;
node_buf.write_u8(StandardType::Attribute as u8).context(KbinErrorKind::DataWrite(StandardType::Attribute.name))?;
match options.compression {
Compression::Compressed => Sixbit::pack(&mut **node_buf, &key)?,
Compression::Uncompressed => {
@ -226,8 +225,8 @@ impl Writeable for NodeCollection {
child.write_node(options, node_buf, data_buf)?;
}
// Always has the array bit set
node_buf.write_u8(StandardType::NodeEnd.id | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
// node end always has the array bit set
node_buf.write_u8(StandardType::NodeEnd as u8 | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
Ok(())
}
@ -249,7 +248,7 @@ impl Writeable for Node {
node_type.count,
is_array);
node_buf.write_u8(node_type.id | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
node_buf.write_u8(node_type as u8 | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
match options.compression {
Compression::Compressed => Sixbit::pack(&mut **node_buf, &self.key())?,
Compression::Uncompressed => {
@ -270,7 +269,7 @@ impl Writeable for Node {
data_buf.write_str(options.encoding, value)?;
node_buf.write_u8(StandardType::Attribute.id).context(KbinErrorKind::DataWrite(StandardType::Attribute.name))?;
node_buf.write_u8(StandardType::Attribute as u8).context(KbinErrorKind::DataWrite(StandardType::Attribute.name))?;
match options.compression {
Compression::Compressed => Sixbit::pack(&mut **node_buf, &key)?,
Compression::Uncompressed => {
@ -289,8 +288,8 @@ impl Writeable for Node {
}
}
// Always has the array bit set
node_buf.write_u8(StandardType::NodeEnd.id | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
// node end always has the array bit set
node_buf.write_u8(StandardType::NodeEnd as u8 | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
Ok(())
}
@ -331,7 +330,7 @@ impl Writer {
input.write_node(&self.options, &mut node_buf, &mut data_buf)?;
node_buf.write_u8(StandardType::FileEnd.id | ARRAY_MASK).context(KbinErrorKind::DataWrite("file end"))?;
node_buf.write_u8(StandardType::FileEnd as u8 | ARRAY_MASK).context(KbinErrorKind::DataWrite("file end"))?;
node_buf.realign_writes(None)?;
let mut output = header.into_inner();