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

update code format

Browse Source
This commit is contained in:
Marc-Antoine Arnaud
2018-05-23 17:14:53 +02:00
parent 8b3d98d911
commit d63e9d27d8
18 changed files with 1218 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

288
yaserde_derive/src/de/expand_enum.rs
View File

@@ -1,4 +1,3 @@
use attribute::*;
use field_type::*;
use quote::Tokens;
@@ -8,125 +7,167 @@ use syn::Ident;
use syn::DataEnum;
use proc_macro2::Span;
pub fn parse(data_enum: &DataEnum, name: &Ident, root: &String, _namespaces: &BTreeMap<String, String>) -> Tokens {
let variables : Tokens = data_enum.variants.iter().map(|ref variant|
{
match variant.fields {
Fields::Unit => None,
Fields::Named(ref fields) => {
let enum_fields = fields.named.iter().map(|ref field| {
pub fn parse(
data_enum: &DataEnum,
name: &Ident,
root: &String,
_namespaces: &BTreeMap<String, String>,
) -> Tokens {
let variables: Tokens = data_enum
.variants
.iter()
.map(|ref variant| match variant.fields {
Fields::Unit => None,
Fields::Named(ref fields) => {
let enum_fields = fields
.named
.iter()
.map(|ref field| {
let field_label = field.ident;
match get_field_type(field) {
Some(FieldType::FieldTypeString) =>
build_default_value(&field_label, quote!{String}, quote!{"".to_string()}),
Some(FieldType::FieldTypeBool) =>
build_default_value(&field_label, quote!{bool}, quote!{false}),
Some(FieldType::FieldTypeI8) =>
build_default_value(&field_label, quote!{i8}, quote!{0}),
Some(FieldType::FieldTypeU8) =>
build_default_value(&field_label, quote!{u8}, quote!{0}),
Some(FieldType::FieldTypeI16) =>
build_default_value(&field_label, quote!{i16}, quote!{0}),
Some(FieldType::FieldTypeU16) =>
build_default_value(&field_label, quote!{u16}, quote!{0}),
Some(FieldType::FieldTypeI32) =>
build_default_value(&field_label, quote!{i32}, quote!{0}),
Some(FieldType::FieldTypeU32) =>
build_default_value(&field_label, quote!{u32}, quote!{0}),
Some(FieldType::FieldTypeI64) =>
build_default_value(&field_label, quote!{i64}, quote!{0}),
Some(FieldType::FieldTypeU64) =>
build_default_value(&field_label, quote!{u64}, quote!{0}),
Some(FieldType::FieldTypeStruct{struct_name}) => {
Some(quote!{
#[allow(unused_mut)]
let mut #field_label : #struct_name = #struct_name::default();
})
},
Some(FieldType::FieldTypeVec{data_type}) => {
Some(FieldType::FieldTypeString) => {
build_default_value(&field_label, quote!{String}, quote!{"".to_string()})
}
Some(FieldType::FieldTypeBool) => {
build_default_value(&field_label, quote!{bool}, quote!{false})
}
Some(FieldType::FieldTypeI8) => {
build_default_value(&field_label, quote!{i8}, quote!{0})
}
Some(FieldType::FieldTypeU8) => {
build_default_value(&field_label, quote!{u8}, quote!{0})
}
Some(FieldType::FieldTypeI16) => {
build_default_value(&field_label, quote!{i16}, quote!{0})
}
Some(FieldType::FieldTypeU16) => {
build_default_value(&field_label, quote!{u16}, quote!{0})
}
Some(FieldType::FieldTypeI32) => {
build_default_value(&field_label, quote!{i32}, quote!{0})
}
Some(FieldType::FieldTypeU32) => {
build_default_value(&field_label, quote!{u32}, quote!{0})
}
Some(FieldType::FieldTypeI64) => {
build_default_value(&field_label, quote!{i64}, quote!{0})
}
Some(FieldType::FieldTypeU64) => {
build_default_value(&field_label, quote!{u64}, quote!{0})
}
Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut)]
let mut #field_label : #struct_name = #struct_name::default();
}),
Some(FieldType::FieldTypeVec { data_type }) => {
let dt = Box::into_raw(data_type);
match unsafe{dt.as_ref()} {
Some(&FieldType::FieldTypeString) =>
build_default_value(&field_label, quote!{Vec<String>}, quote!{vec![]}),
Some(&FieldType::FieldTypeBool) =>
build_default_value(&field_label, quote!{Vec<bool>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI8) =>
build_default_value(&field_label, quote!{Vec<i8>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU8) =>
build_default_value(&field_label, quote!{Vec<u8>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI16) =>
build_default_value(&field_label, quote!{Vec<i16>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU16) =>
build_default_value(&field_label, quote!{Vec<u16>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI32) =>
build_default_value(&field_label, quote!{Vec<i32>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU32) =>
build_default_value(&field_label, quote!{Vec<u32>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI64) =>
build_default_value(&field_label, quote!{Vec<i64>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU64) =>
build_default_value(&field_label, quote!{Vec<u64>}, quote!{vec![]}),
Some(&FieldType::FieldTypeStruct{struct_name}) => {
Some(quote!{
#[allow(unused_mut)]
let mut #field_label : Vec<#struct_name> = vec![];
})
},
Some(&FieldType::FieldTypeVec{..}) => {unimplemented!();},
None => {unimplemented!();},
match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => {
build_default_value(&field_label, quote!{Vec<String>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeBool) => {
build_default_value(&field_label, quote!{Vec<bool>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI8) => {
build_default_value(&field_label, quote!{Vec<i8>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU8) => {
build_default_value(&field_label, quote!{Vec<u8>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI16) => {
build_default_value(&field_label, quote!{Vec<i16>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU16) => {
build_default_value(&field_label, quote!{Vec<u16>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI32) => {
build_default_value(&field_label, quote!{Vec<i32>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU32) => {
build_default_value(&field_label, quote!{Vec<u32>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI64) => {
build_default_value(&field_label, quote!{Vec<i64>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU64) => {
build_default_value(&field_label, quote!{Vec<u64>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut)]
let mut #field_label : Vec<#struct_name> = vec![];
}),
Some(&FieldType::FieldTypeVec { .. }) => {
unimplemented!();
}
None => {
unimplemented!();
}
}
},
None => None
}
None => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
Some(enum_fields)
}
Fields::Unnamed(ref _fields) => {
unimplemented!();
}
Some(enum_fields)
}
Fields::Unnamed(ref _fields) => {
unimplemented!();
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
let enum_visitors: Tokens = data_enum.variants.iter().map(|ref variant| {
let enum_visitors: Tokens = data_enum
.variants
.iter()
.map(|ref variant| {
match variant.fields {
Fields::Unit => None,
Fields::Named(ref fields) => {
let enum_fields = fields.named.iter().map(|ref field| {
// let label = field.ident;
// let label_name = label.unwrap().to_string();
// let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
let enum_fields = fields
.named
.iter()
.map(|ref field| {
// let label = field.ident;
// let label_name = label.unwrap().to_string();
// let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
Some(quote!{
// struct #visitor_label;
// impl<'de> Visitor<'de> for #visitor_label {
// type Value = String;
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
Some(quote!{
// struct #visitor_label;
// impl<'de> Visitor<'de> for #visitor_label {
// type Value = String;
// fn visit_str(self, v: &str) -> Result<Self::Value, String> {
// match v {
// _ => Err("unable to match \"{}\" with enum {}", v, #label_name)
// }
// Ok(String::from(v))
// }
// }
})
},
_ => None
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
// fn visit_str(self, v: &str) -> Result<Self::Value, String> {
// match v {
// _ => Err("unable to match \"{}\" with enum {}", v, #label_name)
// }
// Ok(String::from(v))
// }
// }
})
}
_ => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
Some(enum_fields)
}
@@ -137,35 +178,38 @@ pub fn parse(data_enum: &DataEnum, name: &Ident, root: &String, _namespaces: &BT
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
let match_to_enum : Tokens = data_enum.variants.iter().map(|ref variant|
{
let match_to_enum: Tokens = data_enum
.variants
.iter()
.map(|ref variant| {
let field_attrs = YaSerdeAttribute::parse(&variant.attrs);
let renamed_label =
match field_attrs.rename {
Some(value) => Ident::new(&format!("{}", value), Span::call_site()),
None => variant.ident
};
let renamed_label = match field_attrs.rename {
Some(value) => Ident::new(&format!("{}", value), Span::call_site()),
None => variant.ident,
};
let label = variant.ident;
let label_name = renamed_label.to_string();
match variant.fields {
Fields::Unit => {
Some(quote!{
#label_name => {
simple_enum_value = Some(#name::#label);
}
})
},
_ => {
None
}
Fields::Unit => Some(quote!{
#label_name => {
simple_enum_value = Some(#name::#label);
}
}),
_ => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
.fold(Tokens::new(), |mut tokens, token| {
tokens.append_all(token);
tokens
});
quote!{
use xml::reader::XmlEvent;
@@ -228,7 +272,11 @@ pub fn parse(data_enum: &DataEnum, name: &Ident, root: &String, _namespaces: &BT
}
}
fn build_default_value(label: &Option<Ident>, field_type: Tokens, default: Tokens) -> Option<Tokens> {
fn build_default_value(
label: &Option<Ident>,
field_type: Tokens,
default: Tokens,
) -> Option<Tokens> {
Some(quote!{
#[allow(unused_mut)]
let mut #label : #field_type = #default;

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

@@ -1,4 +1,3 @@
use attribute::*;
use field_type::*;
use quote::Tokens;
@@ -7,9 +6,15 @@ use syn::Ident;
use syn::DataStruct;
use proc_macro2::Span;
pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces: &BTreeMap<String, String>) -> Tokens {
let validate_namespace : Tokens = namespaces.iter().map(|(ref _prefix, ref namespace)| {
pub fn parse(
data_struct: &DataStruct,
name: &Ident,
root: &String,
namespaces: &BTreeMap<String, String>,
) -> Tokens {
let validate_namespace: Tokens = namespaces
.iter()
.map(|(ref _prefix, ref namespace)| {
Some(quote!(
let mut found = false;
@@ -26,88 +31,98 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
.fold(Tokens::new(), |mut tokens, token| {
tokens.append_all(token);
tokens
});
let variables: Tokens = data_struct.fields.iter().map(|ref field|
{
let variables: Tokens = data_struct
.fields
.iter()
.map(|ref field| {
let label = field.ident;
match get_field_type(field) {
Some(FieldType::FieldTypeString) =>
build_default_value(&label, quote!{String}, quote!{"".to_string()}),
Some(FieldType::FieldTypeBool) =>
build_default_value(&label, quote!{bool}, quote!{false}),
Some(FieldType::FieldTypeI8) =>
build_default_value(&label, quote!{i8}, quote!{0}),
Some(FieldType::FieldTypeU8) =>
build_default_value(&label, quote!{u8}, quote!{0}),
Some(FieldType::FieldTypeI16) =>
build_default_value(&label, quote!{i16}, quote!{0}),
Some(FieldType::FieldTypeU16) =>
build_default_value(&label, quote!{u16}, quote!{0}),
Some(FieldType::FieldTypeI32) =>
build_default_value(&label, quote!{i32}, quote!{0}),
Some(FieldType::FieldTypeU32) =>
build_default_value(&label, quote!{u32}, quote!{0}),
Some(FieldType::FieldTypeI64) =>
build_default_value(&label, quote!{i64}, quote!{0}),
Some(FieldType::FieldTypeU64) =>
build_default_value(&label, quote!{u64}, quote!{0}),
Some(FieldType::FieldTypeStruct{struct_name}) => {
Some(quote!{
#[allow(unused_mut, non_snake_case, non_camel_case_types)]
let mut #label : #struct_name = #struct_name::default();
})
},
Some(FieldType::FieldTypeVec{data_type}) => {
Some(FieldType::FieldTypeString) => {
build_default_value(&label, quote!{String}, quote!{"".to_string()})
}
Some(FieldType::FieldTypeBool) => build_default_value(&label, quote!{bool}, quote!{false}),
Some(FieldType::FieldTypeI8) => build_default_value(&label, quote!{i8}, quote!{0}),
Some(FieldType::FieldTypeU8) => build_default_value(&label, quote!{u8}, quote!{0}),
Some(FieldType::FieldTypeI16) => build_default_value(&label, quote!{i16}, quote!{0}),
Some(FieldType::FieldTypeU16) => build_default_value(&label, quote!{u16}, quote!{0}),
Some(FieldType::FieldTypeI32) => build_default_value(&label, quote!{i32}, quote!{0}),
Some(FieldType::FieldTypeU32) => build_default_value(&label, quote!{u32}, quote!{0}),
Some(FieldType::FieldTypeI64) => build_default_value(&label, quote!{i64}, quote!{0}),
Some(FieldType::FieldTypeU64) => build_default_value(&label, quote!{u64}, quote!{0}),
Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut, non_snake_case, non_camel_case_types)]
let mut #label : #struct_name = #struct_name::default();
}),
Some(FieldType::FieldTypeVec { data_type }) => {
let dt = Box::into_raw(data_type);
match unsafe{dt.as_ref()} {
Some(&FieldType::FieldTypeString) =>
build_default_value(&label, quote!{Vec<String>}, quote!{vec![]}),
Some(&FieldType::FieldTypeBool) =>
build_default_value(&label, quote!{Vec<bool>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI8) =>
build_default_value(&label, quote!{Vec<i8>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU8) =>
build_default_value(&label, quote!{Vec<u8>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI16) =>
build_default_value(&label, quote!{Vec<i16>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU16) =>
build_default_value(&label, quote!{Vec<u16>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI32) =>
build_default_value(&label, quote!{Vec<i32>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU32) =>
build_default_value(&label, quote!{Vec<u32>}, quote!{vec![]}),
Some(&FieldType::FieldTypeI64) =>
build_default_value(&label, quote!{Vec<i64>}, quote!{vec![]}),
Some(&FieldType::FieldTypeU64) =>
build_default_value(&label, quote!{Vec<u64>}, quote!{vec![]}),
Some(&FieldType::FieldTypeStruct{struct_name}) => {
Some(quote!{
#[allow(unused_mut)]
let mut #label : Vec<#struct_name> = vec![];
})
},
Some(&FieldType::FieldTypeVec{..}) => {unimplemented!();},
None => {unimplemented!();},
match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => {
build_default_value(&label, quote!{Vec<String>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeBool) => {
build_default_value(&label, quote!{Vec<bool>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI8) => {
build_default_value(&label, quote!{Vec<i8>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU8) => {
build_default_value(&label, quote!{Vec<u8>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI16) => {
build_default_value(&label, quote!{Vec<i16>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU16) => {
build_default_value(&label, quote!{Vec<u16>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI32) => {
build_default_value(&label, quote!{Vec<i32>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU32) => {
build_default_value(&label, quote!{Vec<u32>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeI64) => {
build_default_value(&label, quote!{Vec<i64>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeU64) => {
build_default_value(&label, quote!{Vec<u64>}, quote!{vec![]})
}
Some(&FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut)]
let mut #label : Vec<#struct_name> = vec![];
}),
Some(&FieldType::FieldTypeVec { .. }) => {
unimplemented!();
}
None => {
unimplemented!();
}
}
},
_ => None
}
_ => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
let field_visitors: Tokens = data_struct.fields.iter().map(|ref field|
{
let field_visitors: Tokens = data_struct
.fields
.iter()
.map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
let label_name =
if let Some(value) = field_attrs.rename {
Ident::new(&format!("{}", value), Span::call_site()).to_string()
} else {
field.ident.unwrap().to_string()
};
let label_name = if let Some(value) = field_attrs.rename {
Ident::new(&format!("{}", value), Span::call_site()).to_string()
} else {
field.ident.unwrap().to_string()
};
let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
@@ -115,46 +130,49 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
Some(FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site());
build_declare_visitor(quote!{String}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site());
build_declare_visitor(quote!{bool}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site());
build_declare_visitor(quote!{i8}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site());
build_declare_visitor(quote!{u8}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site());
build_declare_visitor(quote!{i16}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site());
build_declare_visitor(quote!{u16}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site());
build_declare_visitor(quote!{i32}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site());
build_declare_visitor(quote!{u32}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site());
build_declare_visitor(quote!{i64}, &visitor, &visitor_label)
},
}
Some(FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site());
build_declare_visitor(quote!{u64}, &visitor, &visitor_label)
},
Some(FieldType::FieldTypeStruct{struct_name}) => {
}
Some(FieldType::FieldTypeStruct { struct_name }) => {
let struct_id = struct_name.to_string();
let struct_ident = Ident::new(&format!("__Visitor_{}_{}", label_name, struct_name), Span::call_site());
let struct_ident = Ident::new(
&format!("__Visitor_{}_{}", label_name, struct_name),
Span::call_site(),
);
Some(quote!{
#[allow(non_snake_case, non_camel_case_types)]
@@ -169,10 +187,10 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
}
}
})
},
Some(FieldType::FieldTypeVec{data_type}) => {
}
Some(FieldType::FieldTypeVec { data_type }) => {
let dt = Box::into_raw(data_type);
match unsafe{dt.as_ref()} {
match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site());
build_declare_visitor(quote!{String}, &visitor, &visitor_label)
@@ -213,7 +231,7 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
let visitor = Ident::new("visit_u64", Span::call_site());
build_declare_visitor(quote!{u64}, &visitor, &visitor_label)
}
Some(&FieldType::FieldTypeStruct{struct_name}) => {
Some(&FieldType::FieldTypeStruct { struct_name }) => {
let struct_ident = Ident::new(&format!("{}", struct_name), Span::def_site());
Some(quote!{
#[allow(non_snake_case, non_camel_case_types)]
@@ -223,20 +241,23 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
}
})
}
_ => {
None
}
_ => None,
}
},
_ => None
}
_ => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
let call_visitors: Tokens = data_struct.fields.iter().map(|ref field|
{
let call_visitors: Tokens = data_struct
.fields
.iter()
.map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
let label = field.ident;
@@ -244,116 +265,253 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
return None;
}
let label_name =
if let Some(value) = field_attrs.rename {
Ident::new(&format!("{}", value), Span::call_site()).to_string()
} else {
field.ident.unwrap().to_string()
};
let label_name = if let Some(value) = field_attrs.rename {
Ident::new(&format!("{}", value), Span::call_site()).to_string()
} else {
field.ident.unwrap().to_string()
};
let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site());
build_call_visitor(quote!{String}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{String},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site());
build_call_visitor(quote!{bool}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{bool},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site());
build_call_visitor(quote!{i8}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{i8},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site());
build_call_visitor(quote!{u8}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{u8},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site());
build_call_visitor(quote!{u16}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{u16},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site());
build_call_visitor(quote!{i16}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{i16},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site());
build_call_visitor(quote!{u32}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{u32},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site());
build_call_visitor(quote!{i32}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{i32},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site());
build_call_visitor(quote!{u64}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
build_call_visitor(
quote!{u64},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site());
build_call_visitor(quote!{i64}, &visitor, quote!{= value}, &visitor_label, &label, &label_name)
},
Some(FieldType::FieldTypeStruct{struct_name}) => {
Some(quote!{
#label_name => {
reader.set_map_value();
match #struct_name::deserialize(reader) {
Ok(parsed_item) => {
#label = parsed_item;
let _root = reader.next();
},
Err(msg) => {
return Err(msg);
},
}
build_call_visitor(
quote!{i64},
&visitor,
quote!{= value},
&visitor_label,
&label,
&label_name,
)
}
Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#label_name => {
reader.set_map_value();
match #struct_name::deserialize(reader) {
Ok(parsed_item) => {
#label = parsed_item;
let _root = reader.next();
},
Err(msg) => {
return Err(msg);
},
}
})
},
Some(FieldType::FieldTypeVec{data_type}) => {
}
}),
Some(FieldType::FieldTypeVec { data_type }) => {
let dt = Box::into_raw(data_type);
match unsafe{dt.as_ref()} {
match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site());
build_call_visitor(quote!{String}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{String},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site());
build_call_visitor(quote!{bool}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{bool},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site());
build_call_visitor(quote!{i8}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{i8},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site());
build_call_visitor(quote!{u8}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{u8},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site());
build_call_visitor(quote!{i16}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{i16},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site());
build_call_visitor(quote!{u16}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{u16},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site());
build_call_visitor(quote!{i32}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{i32},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site());
build_call_visitor(quote!{u32}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{u32},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site());
build_call_visitor(quote!{i64}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{i64},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site());
build_call_visitor(quote!{u64}, &visitor, quote!{.push(value)}, &visitor_label, &label, &label_name)
build_call_visitor(
quote!{u64},
&visitor,
quote!{.push(value)},
&visitor_label,
&label,
&label_name,
)
}
Some(&FieldType::FieldTypeStruct{struct_name}) => {
Some(&FieldType::FieldTypeStruct { struct_name }) => {
let struct_ident = Ident::new(&format!("{}", struct_name), Span::def_site());
Some(quote!{
#label_name => {
@@ -370,101 +528,144 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
}
})
}
_ => unimplemented!()
_ => unimplemented!(),
}
},
_ => None
}
_ => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
let attributes_loading: Tokens = data_struct.fields.iter().map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
if !field_attrs.attribute {
return None;
}
let attributes_loading: Tokens = data_struct
.fields
.iter()
.map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
if !field_attrs.attribute {
return None;
}
let label = field.ident;
let label_name =
if let Some(value) = field_attrs.rename {
let label = field.ident;
let label_name = if let Some(value) = field_attrs.rename {
Ident::new(&format!("{}", value), Span::call_site()).to_string()
} else {
field.ident.unwrap().to_string()
};
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
Some(quote!{
match get_field_type(field) {
Some(FieldType::FieldTypeString) => Some(quote!{
for attr in attributes {
if attr.name.local_name == #label_name {
#label = attr.value.to_owned();
}
}
})
}
Some(FieldType::FieldTypeStruct{struct_name}) => {
let struct_ident = Ident::new(&format!("__Visitor_{}_{}", label_name, struct_name), Span::call_site());
}),
Some(FieldType::FieldTypeStruct { struct_name }) => {
let struct_ident = Ident::new(
&format!("__Visitor_{}_{}", label_name, struct_name),
Span::call_site(),
);
Some(quote!{
for attr in attributes {
if attr.name.local_name == #label_name {
let visitor = #struct_ident{};
match visitor.visit_str(&attr.value) {
Ok(value) => {#label = value;}
Err(msg) => {return Err(msg);}
Some(quote!{
for attr in attributes {
if attr.name.local_name == #label_name {
let visitor = #struct_ident{};
match visitor.visit_str(&attr.value) {
Ok(value) => {#label = value;}
Err(msg) => {return Err(msg);}
}
}
}
}
})
}
_ => {
None
}
}})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut sum, val| {sum.append_all(val); sum});
let set_text: Tokens = data_struct.fields.iter().map(|ref field|
{
let label = field.ident;
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
match get_field_type(field) {
Some(FieldType::FieldTypeString) =>
build_set_text_to_value(&field_attrs, &label, quote!{text_content.to_owned()}),
Some(FieldType::FieldTypeBool) =>
build_set_text_to_value(&field_attrs, &label, quote!{bool::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeI8) =>
build_set_text_to_value(&field_attrs, &label, quote!{i8::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeU8) =>
build_set_text_to_value(&field_attrs, &label, quote!{u8::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeI16) =>
build_set_text_to_value(&field_attrs, &label, quote!{i16::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeU16) =>
build_set_text_to_value(&field_attrs, &label, quote!{u16::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeI32) =>
build_set_text_to_value(&field_attrs, &label, quote!{i32::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeU32) =>
build_set_text_to_value(&field_attrs, &label, quote!{u32::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeI64) =>
build_set_text_to_value(&field_attrs, &label, quote!{i64::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeU64) =>
build_set_text_to_value(&field_attrs, &label, quote!{u64::from_str(text_content).unwrap()}),
Some(FieldType::FieldTypeStruct{..}) |
Some(FieldType::FieldTypeVec{..})|
None => None,
})
}
_ => None,
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
.fold(Tokens::new(), |mut sum, val| {
sum.append_all(val);
sum
});
let struct_builder: Tokens = data_struct.fields.iter().map(|ref field|
{
let set_text: Tokens = data_struct
.fields
.iter()
.map(|ref field| {
let label = field.ident;
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
build_set_text_to_value(&field_attrs, &label, quote!{text_content.to_owned()})
}
Some(FieldType::FieldTypeBool) => build_set_text_to_value(
&field_attrs,
&label,
quote!{bool::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeI8) => build_set_text_to_value(
&field_attrs,
&label,
quote!{i8::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeU8) => build_set_text_to_value(
&field_attrs,
&label,
quote!{u8::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeI16) => build_set_text_to_value(
&field_attrs,
&label,
quote!{i16::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeU16) => build_set_text_to_value(
&field_attrs,
&label,
quote!{u16::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeI32) => build_set_text_to_value(
&field_attrs,
&label,
quote!{i32::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeU32) => build_set_text_to_value(
&field_attrs,
&label,
quote!{u32::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeI64) => build_set_text_to_value(
&field_attrs,
&label,
quote!{i64::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeU64) => build_set_text_to_value(
&field_attrs,
&label,
quote!{u64::from_str(text_content).unwrap()},
),
Some(FieldType::FieldTypeStruct { .. }) | Some(FieldType::FieldTypeVec { .. }) | None => {
None
}
}
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut tokens, token| {
tokens.append_all(token);
tokens
});
let struct_builder: Tokens = data_struct
.fields
.iter()
.map(|ref field| {
let label = field.ident;
if get_field_type(field).is_some() {
@@ -477,7 +678,10 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
.fold(Tokens::new(), |mut tokens, token| {
tokens.append_all(token);
tokens
});
quote! {
use xml::reader::XmlEvent;
@@ -537,14 +741,22 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces:
}
}
fn build_default_value(label: &Option<Ident>, field_type: Tokens, default: Tokens) -> Option<Tokens> {
fn build_default_value(
label: &Option<Ident>,
field_type: Tokens,
default: Tokens,
) -> Option<Tokens> {
Some(quote!{
#[allow(unused_mut)]
let mut #label : #field_type = #default;
})
}
fn build_declare_visitor(field_type: Tokens, visitor: &Ident, visitor_label: &Ident) -> Option<Tokens> {
fn build_declare_visitor(
field_type: Tokens,
visitor: &Ident,
visitor_label: &Ident,
) -> Option<Tokens> {
Some(quote!{
#[allow(non_snake_case, non_camel_case_types)]
struct #visitor_label;
@@ -558,7 +770,14 @@ fn build_declare_visitor(field_type: Tokens, visitor: &Ident, visitor_label: &Id
})
}
fn build_call_visitor(field_type: Tokens, visitor: &Ident, action: Tokens, visitor_label: &Ident, label: &Option<Ident>, label_name: &String) -> Option<Tokens> {
fn build_call_visitor(
field_type: Tokens,
visitor: &Ident,
action: Tokens,
visitor_label: &Ident,
label: &Option<Ident>,
label_name: &String,
) -> Option<Tokens> {
Some(quote!{
#label_name => {
let visitor = #visitor_label{};
@@ -587,8 +806,11 @@ fn build_call_visitor(field_type: Tokens, visitor: &Ident, action: Tokens, visit
})
}
fn build_set_text_to_value(field_attrs: &YaSerdeAttribute, label: &Option<Ident>, action: Tokens) -> Option<Tokens> {
fn build_set_text_to_value(
field_attrs: &YaSerdeAttribute,
label: &Option<Ident>,
action: Tokens,
) -> Option<Tokens> {
if field_attrs.text {
Some(quote!{
#label = #action;

27
yaserde_derive/src/de/mod.rs
View File

@@ -1,4 +1,3 @@
pub mod expand_enum;
pub mod expand_struct;
@@ -16,20 +15,20 @@ pub fn expand_derive_deserialize(ast: &syn::DeriveInput) -> Result<quote::Tokens
let root_attrs = attribute::YaSerdeAttribute::parse(&attrs);
let root = root_attrs.clone().root.unwrap_or(name.to_string());
let impl_block =
match data {
&syn::Data::Struct(ref data_struct) => {
expand_struct::parse(data_struct, &name, &root, &root_attrs.namespaces)
},
&syn::Data::Enum(ref data_enum) => {
expand_enum::parse(data_enum, &name, &root, &root_attrs.namespaces)
},
&syn::Data::Union(ref _data_union) => {
unimplemented!()
},
};
let impl_block = match data {
&syn::Data::Struct(ref data_struct) => {
expand_struct::parse(data_struct, &name, &root, &root_attrs.namespaces)
}
&syn::Data::Enum(ref data_enum) => {
expand_enum::parse(data_enum, &name, &root, &root_attrs.namespaces)
}
&syn::Data::Union(ref _data_union) => unimplemented!(),
};
let dummy_const = Ident::new(&format!("_IMPL_YA_DESERIALIZE_FOR_{}", name), Span::def_site());
let dummy_const = Ident::new(
&format!("_IMPL_YA_DESERIALIZE_FOR_{}", name),
Span::def_site(),
);
let generated = quote! {
#[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]