NationTech/yaserde
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deserialize with default

Browse Source 
issue #9
This commit is contained in:
Marc-Antoine Arnaud
2018-12-06 00:21:54 +01:00
parent 2e74682880
commit bd4bd3f495
5 changed files with 117 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yaserde_derive/Cargo.toml
View File

@@ -11,9 +11,9 @@ documentation = "https://docs.rs/yaserde"
readme = "../README.md" readme = "../README.md"
[dependencies] [dependencies]
syn = { version = "0.15.0", features = ["visit", "extra-traits"] } syn = { version = "0.15.22", features = ["visit", "extra-traits"] }
proc-macro2 = "0.4.3" proc-macro2 = "0.4.24"
quote = "0.6.2" quote = "0.6.10"
[lib] [lib]
name = "yaserde_derive" name = "yaserde_derive"

70
yaserde_derive/src/attribute.rs
View File

@@ -4,11 +4,12 @@ use proc_macro2::TokenTree;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use syn::Attribute; use syn::Attribute;
#[derive(Debug, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct YaSerdeAttribute { pub struct YaSerdeAttribute {
pub root: Option<String>, pub root: Option<String>,
pub rename: Option<String>, pub rename: Option<String>,
pub prefix: Option<String>, pub prefix: Option<String>,
pub default: Option<String>,
pub namespaces: BTreeMap<String, String>, pub namespaces: BTreeMap<String, String>,
pub attribute: bool, pub attribute: bool,
pub text: bool, pub text: bool,
@@ -35,6 +36,7 @@ impl YaSerdeAttribute {
let mut prefix = None; let mut prefix = None;
let mut rename = None; let mut rename = None;
let mut root = None; let mut root = None;
let mut default = None;
let mut text = false; let mut text = false;
for attr in attrs.iter() { for attr in attrs.iter() {
@@ -70,6 +72,9 @@ impl YaSerdeAttribute {
"root" => { "root" => {
root = get_value(&mut attr_iter); root = get_value(&mut attr_iter);
} }
"default" => {
default = get_value(&mut attr_iter);
}
"text" => { "text" => {
text = true; text = true;
} }
@@ -88,7 +93,70 @@ impl YaSerdeAttribute {
prefix, prefix,
rename, rename,
root, root,
default,
text, text,
} }
} }
} }
#[test]
fn parse_empty_attributes() {
let attributes = vec![];
let attrs = YaSerdeAttribute::parse(&attributes);
assert_eq!(YaSerdeAttribute {
root: None,
rename: None,
prefix: None,
default: None,
namespaces: BTreeMap::new(),
attribute: false,
text: false,
}, attrs);
}
#[test]
fn parse_attributes() {
use proc_macro2::{Span, TokenStream};
use std::str::FromStr;
use syn::AttrStyle::Outer;
use syn::{Ident, Path, PathArguments, PathSegment};
use syn::token::Pound;
use syn::token::Bracket;
use syn::punctuated::Punctuated;
let mut punctuated = Punctuated::new();
punctuated.push(PathSegment {
ident: Ident::new("yaserde", Span::call_site()),
arguments: PathArguments::None
});
let attributes = vec![
Attribute {
pound_token: Pound {
spans: [Span::call_site()]
},
style: Outer,
bracket_token: Bracket {
span: Span::call_site()
},
path: Path {
leading_colon: None,
segments: punctuated
},
tts: TokenStream::from_str("(attribute)").unwrap()
}
];
let attrs = YaSerdeAttribute::parse(&attributes);
assert_eq!(YaSerdeAttribute {
root: None,
rename: None,
prefix: None,
default: None,
namespaces: BTreeMap::new(),
attribute: true,
text: false,
}, attrs);
}

70
yaserde_derive/src/de/expand_struct.rs
View File

@@ -40,21 +40,23 @@ pub fn parse(
.iter() .iter()
.map(|field| { .map(|field| {
let label = &field.ident; let label = &field.ident;
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
match get_field_type(field) { match get_field_type(field) {
Some(FieldType::FieldTypeString) => { Some(FieldType::FieldTypeString) => {
build_default_value(label, &quote!{String}, &quote!{"".to_string()}) build_default_value(label, &quote!{String}, &quote!{"".to_string()}, &field_attrs.default)
} }
Some(FieldType::FieldTypeBool) => build_default_value(label, &quote!{bool}, &quote!{false}), Some(FieldType::FieldTypeBool) => build_default_value(label, &quote!{bool}, &quote!{false}, &field_attrs.default),
Some(FieldType::FieldTypeI8) => build_default_value(label, &quote!{i8}, &quote!{0}), Some(FieldType::FieldTypeI8) => build_default_value(label, &quote!{i8}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeU8) => build_default_value(label, &quote!{u8}, &quote!{0}), Some(FieldType::FieldTypeU8) => build_default_value(label, &quote!{u8}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeI16) => build_default_value(label, &quote!{i16}, &quote!{0}), Some(FieldType::FieldTypeI16) => build_default_value(label, &quote!{i16}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeU16) => build_default_value(label, &quote!{u16}, &quote!{0}), Some(FieldType::FieldTypeU16) => build_default_value(label, &quote!{u16}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeI32) => build_default_value(label, &quote!{i32}, &quote!{0}), Some(FieldType::FieldTypeI32) => build_default_value(label, &quote!{i32}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeU32) => build_default_value(label, &quote!{u32}, &quote!{0}), Some(FieldType::FieldTypeU32) => build_default_value(label, &quote!{u32}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeI64) => build_default_value(label, &quote!{i64}, &quote!{0}), Some(FieldType::FieldTypeI64) => build_default_value(label, &quote!{i64}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeU64) => build_default_value(label, &quote!{u64}, &quote!{0}), Some(FieldType::FieldTypeU64) => build_default_value(label, &quote!{u64}, &quote!{0}, &field_attrs.default),
Some(FieldType::FieldTypeF32) => build_default_value(label, &quote!{f32}, &quote!{0.0}), Some(FieldType::FieldTypeF32) => build_default_value(label, &quote!{f32}, &quote!{0.0}, &field_attrs.default),
Some(FieldType::FieldTypeF64) => build_default_value(label, &quote!{f64}, &quote!{0.0}), Some(FieldType::FieldTypeF64) => build_default_value(label, &quote!{f64}, &quote!{0.0}, &field_attrs.default),
Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut, non_snake_case, non_camel_case_types)] #[allow(unused_mut, non_snake_case, non_camel_case_types)]
let mut #label : #struct_name = #struct_name::default(); let mut #label : #struct_name = #struct_name::default();
@@ -67,40 +69,40 @@ pub fn parse(
let dt = Box::into_raw(data_type); let dt = Box::into_raw(data_type);
match unsafe { dt.as_ref() } { match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => { Some(&FieldType::FieldTypeString) => {
build_default_value(label, &quote!{Vec<String>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<String>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeBool) => { Some(&FieldType::FieldTypeBool) => {
build_default_value(label, &quote!{Vec<bool>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<bool>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeI8) => { Some(&FieldType::FieldTypeI8) => {
build_default_value(label, &quote!{Vec<i8>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<i8>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeU8) => { Some(&FieldType::FieldTypeU8) => {
build_default_value(label, &quote!{Vec<u8>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<u8>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeI16) => { Some(&FieldType::FieldTypeI16) => {
build_default_value(label, &quote!{Vec<i16>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<i16>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeU16) => { Some(&FieldType::FieldTypeU16) => {
build_default_value(label, &quote!{Vec<u16>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<u16>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeI32) => { Some(&FieldType::FieldTypeI32) => {
build_default_value(label, &quote!{Vec<i32>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<i32>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeU32) => { Some(&FieldType::FieldTypeU32) => {
build_default_value(label, &quote!{Vec<u32>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<u32>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeI64) => { Some(&FieldType::FieldTypeI64) => {
build_default_value(label, &quote!{Vec<i64>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<i64>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeU64) => { Some(&FieldType::FieldTypeU64) => {
build_default_value(label, &quote!{Vec<u64>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<u64>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeF32) => { Some(&FieldType::FieldTypeF32) => {
build_default_value(label, &quote!{Vec<f32>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<f32>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeF64) => { Some(&FieldType::FieldTypeF64) => {
build_default_value(label, &quote!{Vec<f64>}, &quote!{vec![]}) build_default_value(label, &quote!{Vec<f64>}, &quote!{vec![]}, &field_attrs.default)
} }
Some(&FieldType::FieldTypeStruct { ref struct_name }) => Some(quote!{ Some(&FieldType::FieldTypeStruct { ref struct_name }) => Some(quote!{
#[allow(unused_mut)] #[allow(unused_mut)]
@@ -1181,12 +1183,22 @@ pub fn parse(
fn build_default_value( fn build_default_value(
label: &Option<Ident>, label: &Option<Ident>,
field_type: &TokenStream, field_type: &TokenStream,
default: &TokenStream, value: &TokenStream,
default: &Option<String>,
) -> Option<TokenStream> { ) -> Option<TokenStream> {
Some(quote!{ if let Some(d) = default {
#[allow(unused_mut)] let default_function = Ident::new(&d, Span::call_site());
let mut #label : #field_type = #default;
}) Some(quote!{
#[allow(unused_mut)]
let mut #label : #field_type = #default_function();
})
} else {
Some(quote!{
#[allow(unused_mut)]
let mut #label : #field_type = #value;
})
}
} }
fn build_declare_visitor( fn build_declare_visitor(

4
yaserde_derive/src/ser/expand_enum.rs
View File

@@ -19,7 +19,7 @@ pub fn serialize(
.map(|variant| { .map(|variant| {
let variant_attrs = YaSerdeAttribute::parse(&variant.attrs); let variant_attrs = YaSerdeAttribute::parse(&variant.attrs);
let renamed_label = match variant_attrs.rename { let renamed_label = match variant_attrs.rename {
Some(value) => Ident::new(&value.to_string(), Span::call_site()), Some(value) => Ident::new(&value, Span::call_site()),
None => variant.ident.clone(), None => variant.ident.clone(),
}; };
let label = &variant.ident; let label = &variant.ident;
@@ -55,7 +55,7 @@ pub fn serialize(
} }
let renamed_field_label = match field_attrs.rename { let renamed_field_label = match field_attrs.rename {
Some(value) => Some(Ident::new(&value.to_string(), Span::call_site())), Some(value) => Some(Ident::new(&value.replace("\"", ""), Span::call_site())),
None => field.ident.clone(), None => field.ident.clone(),
}; };
let field_label_name = renamed_field_label.unwrap().to_string(); let field_label_name = renamed_field_label.unwrap().to_string();

4
yaserde_derive/src/ser/expand_struct.rs
View File

@@ -23,7 +23,7 @@ pub fn serialize(
} }
let renamed_label = match field_attrs.rename { let renamed_label = match field_attrs.rename {
Some(value) => Ident::new(&value.to_string(), Span::call_site()), Some(value) => Ident::new(&value, Span::call_site()),
None => field.ident.clone().unwrap(), None => field.ident.clone().unwrap(),
}; };
let label = &field.ident; let label = &field.ident;
@@ -165,7 +165,7 @@ pub fn serialize(
} }
let renamed_label = match field_attrs.rename { let renamed_label = match field_attrs.rename {
Some(value) => Ident::new(&value.to_string(), Span::call_site()), Some(value) => Ident::new(&value, Span::call_site()),
None => field.ident.clone().unwrap(), None => field.ident.clone().unwrap(),
}; };