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

value: remove Node variant, remnant of serde work

Browse Source
This commit is contained in:
Matt Bilker
2019-06-14 05:51:43 +00:00
parent f716ff2422
commit 26ed824fa4
2 changed files with 66 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compression.rs
View File

@@ -18,7 +18,7 @@ impl Compression {
pub fn to_byte(&self) -> u8 {
match *self {
Compression::Compressed => SIG_COMPRESSED,
Compression::Compressed => SIG_COMPRESSED,
Compression::Uncompressed => SIG_UNCOMPRESSED,
}
}

146
src/value.rs
View File

@@ -8,9 +8,72 @@ use failure::{Fail, ResultExt};
use rustc_hex::FromHex;
use crate::error::{KbinError, KbinErrorKind};
use crate::node::Node;
use crate::node_types::{self, StandardType};
macro_rules! construct_types {
(
$(
($konst:ident, $($value_type:tt)*);
)+
) => {
#[derive(Clone, PartialEq)]
pub enum Value {
$(
$konst($($value_type)*),
)+
Binary(Vec<u8>),
Time(u32),
Attribute(String),
Array(StandardType, Vec<Value>),
}
$(
impl From<$($value_type)*> for Value {
fn from(value: $($value_type)*) -> Value {
Value::$konst(value)
}
}
impl TryFrom<Value> for $($value_type)* {
type Error = KbinError;
fn try_from(value: Value) -> Result<Self, Self::Error> {
match value {
Value::$konst(v) => Ok(v),
value => Err(KbinErrorKind::ValueTypeMismatch(StandardType::$konst, value).into()),
}
}
}
impl TryFrom<&Value> for $($value_type)* {
type Error = KbinError;
fn try_from(value: &Value) -> Result<Self, Self::Error> {
match value {
Value::$konst(ref v) => Ok(v.clone()),
value => Err(KbinErrorKind::ValueTypeMismatch(StandardType::$konst, value.clone()).into()),
}
}
}
)+
impl Value {
pub fn standard_type(&self) -> StandardType {
match *self {
$(
Value::$konst(_) => StandardType::$konst,
)+
Value::Binary(_) => StandardType::Binary,
Value::Time(_) => StandardType::Time,
Value::Attribute(_) => StandardType::Attribute,
Value::Array(node_type, _) => node_type,
}
}
}
}
}
macro_rules! tuple {
(
byte: [
@@ -333,8 +396,7 @@ macro_rules! tuple {
}
},
Value::Attribute(_) |
Value::String(_) |
Value::Node(_) => return Err(KbinErrorKind::InvalidNodeType(self.standard_type()).into()),
Value::String(_) => return Err(KbinErrorKind::InvalidNodeType(self.standard_type()).into()),
$(
Value::$s8_konst(value) => {
output.reserve(value.len());
@@ -376,72 +438,6 @@ macro_rules! tuple {
};
}
macro_rules! construct_types {
(
$(
($konst:ident, $($value_type:tt)*);
)+
) => {
#[derive(Clone, PartialEq)]
pub enum Value {
$(
$konst($($value_type)*),
)+
Binary(Vec<u8>),
Time(u32),
Attribute(String),
Array(StandardType, Vec<Value>),
Node(Box<Node>),
}
$(
impl From<$($value_type)*> for Value {
fn from(value: $($value_type)*) -> Value {
Value::$konst(value)
}
}
impl TryFrom<Value> for $($value_type)* {
type Error = KbinError;
fn try_from(value: Value) -> Result<Self, Self::Error> {
match value {
Value::$konst(v) => Ok(v),
value => Err(KbinErrorKind::ValueTypeMismatch(StandardType::$konst, value).into()),
}
}
}
impl TryFrom<&Value> for $($value_type)* {
type Error = KbinError;
fn try_from(value: &Value) -> Result<Self, Self::Error> {
match value {
Value::$konst(ref v) => Ok(v.clone()),
value => Err(KbinErrorKind::ValueTypeMismatch(StandardType::$konst, value.clone()).into()),
}
}
}
)+
impl Value {
pub fn standard_type(&self) -> StandardType {
match *self {
$(
Value::$konst(_) => StandardType::$konst,
)+
Value::Binary(_) => StandardType::Binary,
Value::Time(_) => StandardType::Time,
Value::Attribute(_) => StandardType::Attribute,
Value::Array(node_type, _) => node_type,
Value::Node(_) => StandardType::NodeStart,
}
}
}
}
}
impl Value {
tuple! {
byte: [
@@ -642,20 +638,12 @@ impl fmt::Debug for Value {
macro_rules! field {
(
display: [$($konst_display:ident),*],
debug_alternate: [$($konst_alternate:ident),*],
debug: [$($konst_debug:ident),*]
) => {
match *self {
$(
Value::$konst_display(ref v) => write!(f, concat!(stringify!($konst_display), "({})"), v),
)*
$(
Value::$konst_alternate(ref v) => if f.alternate() {
write!(f, concat!(stringify!($konst_alternate), "({:#?})"), v)
} else {
write!(f, concat!(stringify!($konst_alternate), "({:?})"), v)
},
)*
$(
Value::$konst_debug(ref v) => write!(f, concat!(stringify!($konst_debug), "({:?})"), v),
)*
@@ -675,9 +663,6 @@ impl fmt::Debug for Value {
U8, U16, U32, U64,
Float, Double, Boolean
],
debug_alternate: [
Node
],
debug: [
String, Time, Ip4,
Attribute,
@@ -756,7 +741,6 @@ impl fmt::Display for Value {
false => f.write_str("0"),
},
Value::Array(_, values) => BorrowedValueArray(&values).fmt(f),
Value::Node(_) => Ok(()),
}
};
}