Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-09-09 02:55:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ser(structure): only output nodes when the serializer returns a Some(TypeHint)

Browse Source
This commit is contained in:
Matt Bilker
2018-07-10 15:52:15 +00:00
parent d51f470eb9
commit 42793c60df
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ser/structure.rs
View File

@@ -35,10 +35,8 @@ impl<'a> Struct<'a> {
// The `Vec` cannot be borrowed as mutable in an `else` condition because
// of the immutable borrow made in the previous if statement, so this is a
// workaround
//if ser.hierarchy.is_empty() {
ser.hierarchy.push(name);
trace!("Struct::new(name: {}) => hierarchy: {:?}", name, ser.hierarchy);
//}
ser.hierarchy.push(name);
trace!("Struct::new(name: {}) => hierarchy: {:?}", name, ser.hierarchy);
Ok(Self {
ser,
@@ -59,19 +57,21 @@ impl<'a> SerializeStruct for Struct<'a> {
self.ser.hierarchy.push(key);
debug!("SerializeStruct(name: {})::serialize_field(key: {}) => hierarchy: {:?}", self.name, key, self.ser.hierarchy);
let hint = value.serialize(&mut *self.ser)?.ok_or(KbinErrorKind::MissingTypeHint)?;
let node_type = hint.node_type;
let array_mask = if hint.is_array { ARRAY_MASK } else { 0 };
debug!("SerializeStruct(name: {})::serialize_field(key: {}) => hint: {:?}", self.name, key, hint);
// Serialize methods that return `None` will not be written
if let Some(hint) = value.serialize(&mut *self.ser)? {
let node_type = hint.node_type;
let array_mask = if hint.is_array { ARRAY_MASK } else { 0 };
debug!("SerializeStruct(name: {})::serialize_field(key: {}) => hint: {:?}", self.name, key, hint);
// Struct handler outputs the `NodeStart` event by itself. Avoid repeating it.
if node_type != StandardType::NodeStart {
self.ser.node_buf.write_u8(node_type.id | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
pack_sixbit(&mut *self.ser.node_buf, key)?;
// Struct handler outputs the `NodeStart` event by itself. Avoid repeating it.
if node_type != StandardType::NodeStart {
self.ser.node_buf.write_u8(node_type.id | array_mask).context(KbinErrorKind::DataWrite(node_type.name))?;
pack_sixbit(&mut *self.ser.node_buf, key)?;
// TODO: Make sure this does not prematurely end nodes
if node_type != StandardType::Attribute {
self.ser.node_buf.write_u8(StandardType::NodeEnd.id | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
// TODO: Make sure this does not prematurely end nodes
if node_type != StandardType::Attribute {
self.ser.node_buf.write_u8(StandardType::NodeEnd.id | ARRAY_MASK).context(KbinErrorKind::DataWrite("node end"))?;
}
}
}