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

reader: make parse_node_type a struct method

Browse Source
This commit is contained in:
Matt Bilker
2018-08-15 05:13:39 +00:00
parent 998ed50544
commit c85db383e4
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/reader.rs
View File

@@ -79,6 +79,20 @@ impl<'buf> Reader<'buf> {
})
}
fn parse_node_type(raw_node_type: u8) -> Result<(StandardType, bool)> {
let is_array = raw_node_type & ARRAY_MASK == ARRAY_MASK;
let node_type = raw_node_type & !ARRAY_MASK;
let xml_type = StandardType::from_u8(node_type);
debug!("Reader::parse_node_type() => raw_node_type: {}, node_type: {:?} ({}), is_array: {}",
raw_node_type,
xml_type,
node_type,
is_array);
Ok((xml_type, is_array))
}
#[inline]
pub fn encoding(&self) -> EncodingType {
self.encoding
@@ -99,24 +113,10 @@ impl<'buf> Reader<'buf> {
self.last_node_identifier.as_ref().map(String::as_str)
}
fn parse_node_type(&self, raw_node_type: u8) -> Result<(StandardType, bool)> {
let is_array = raw_node_type & ARRAY_MASK == ARRAY_MASK;
let node_type = raw_node_type & !ARRAY_MASK;
let xml_type = StandardType::from_u8(node_type);
debug!("Reader::parse_node_type() => raw_node_type: {}, node_type: {:?} ({}), is_array: {}",
raw_node_type,
xml_type,
node_type,
is_array);
Ok((xml_type, is_array))
}
pub fn peek_node_type(&self) -> Result<(StandardType, bool)> {
let pos = self.node_buf.position();
let raw_node_type = self.node_buf.get_ref()[pos as usize];
self.parse_node_type(raw_node_type)
Self::parse_node_type(raw_node_type)
}
pub fn peek_node_identifier(&mut self) -> Result<String> {
@@ -132,7 +132,7 @@ impl<'buf> Reader<'buf> {
pub fn read_node_type(&mut self) -> Result<(StandardType, bool)> {
let raw_node_type = self.node_buf.read_u8().context(KbinErrorKind::NodeTypeRead)?;
let value = self.parse_node_type(raw_node_type)?;
let value = Self::parse_node_type(raw_node_type)?;
self.last_node_type = Some(value);
Ok(value)