Skip to content

implicit container tags #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afflux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

implicit container tags #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30ee07a
fix: error out when reading the same field twice without Vec<T>
afflux Jun 20, 2021
bc666b9
feat: container parsing (#27)
afflux Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 149 additions & 26 deletions strong-xml-derive/src/read/named.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@ use crate::types::{Field, Type};

pub fn read(tag: &LitStr, ele_name: TokenStream, fields: &[Field]) -> TokenStream {
let init_fields = fields.iter().map(|field| match field {
Field::Attribute { bind, ty, .. }
| Field::Child { bind, ty, .. }
| Field::FlattenText { bind, ty, .. } => init_value(bind, ty),
Field::Attribute { bind, ty, .. } => init_value(bind, ty, false),
Field::Child {
bind,
ty,
container_tag,
..
}
| Field::FlattenText {
bind,
ty,
container_tag,
..
} => init_value(bind, ty, container_tag.is_some()),
Field::Text { bind, .. } => quote! { let #bind; },
});

Expand All @@ -19,22 +29,24 @@ pub fn read(tag: &LitStr, ele_name: TokenStream, fields: &[Field]) -> TokenStrea
ty,
default,
..
}
| Field::Child {
} => return_value(name, bind, ty, *default, false, &ele_name),
Field::Child {
name,
bind,
ty,
default,
container_tag,
..
}
| Field::FlattenText {
name,
bind,
ty,
default,
container_tag,
..
} => return_value(name, bind, ty, *default, &ele_name),
Field::Text { name, bind, ty, .. } => return_value(name, bind, ty, false, &ele_name),
} => return_value(name, bind, ty, *default, container_tag.is_some(), &ele_name),
Field::Text { name, bind, ty, .. } => return_value(name, bind, ty, false, false, &ele_name),
});

let read_attr_fields = fields.iter().filter_map(|field| match field {
Expand All @@ -54,8 +66,16 @@ pub fn read(tag: &LitStr, ele_name: TokenStream, fields: &[Field]) -> TokenStrea
ty,
tags,
name,
container_tag,
..
} => Some(read_children(tags, bind, name, ty, &ele_name)),
} => Some(read_children(
tags,
bind,
name,
ty,
container_tag.as_ref(),
&ele_name,
)),
_ => None,
});

Expand All @@ -65,8 +85,16 @@ pub fn read(tag: &LitStr, ele_name: TokenStream, fields: &[Field]) -> TokenStrea
ty,
tag,
name,
container_tag,
..
} => Some(read_flatten_text(tag, bind, name, ty, &ele_name)),
} => Some(read_flatten_text(
tag,
bind,
name,
ty,
container_tag.as_ref(),
&ele_name,
)),
_ => None,
});

Expand Down Expand Up @@ -137,8 +165,8 @@ pub fn read(tag: &LitStr, ele_name: TokenStream, fields: &[Field]) -> TokenStrea
}
}

fn init_value(name: &Ident, ty: &Type) -> TokenStream {
if ty.is_vec() {
fn init_value(name: &Ident, ty: &Type, is_container: bool) -> TokenStream {
if ty.is_vec() && !is_container {
quote! { let mut #name = Vec::new(); }
} else {
quote! { let mut #name = None; }
Expand All @@ -150,9 +178,10 @@ fn return_value(
bind: &Ident,
ty: &Type,
default: bool,
is_container: bool,
ele_name: &TokenStream,
) -> TokenStream {
if ty.is_vec() || ty.is_option() {
if (ty.is_vec() && !is_container) || ty.is_option() {
quote! { #name: #bind }
} else if default {
quote! { #name: #bind.unwrap_or_default() }
Expand Down Expand Up @@ -218,20 +247,72 @@ fn read_children(
bind: &Ident,
name: &TokenStream,
ty: &Type,
container_tag: Option<&LitStr>,
ele_name: &TokenStream,
) -> TokenStream {
let from_reader = match &ty {
Type::VecT(ty) => quote! {
#bind.push(<#ty as strong_xml::XmlRead>::from_reader(reader)?);
},
Type::OptionT(ty) | Type::T(ty) => quote! {
#bind = Some(<#ty as strong_xml::XmlRead>::from_reader(reader)?);
},
_ => panic!("`child` attribute only supports Vec<T>, Option<T> and T."),
let match_tags = match container_tag {
Some(container_tag) => quote! { #container_tag },
None => quote! { #( #tags )|* },
};

let from_reader = if let Some(container_tag) = container_tag {
let inner_reader = match &ty {
Type::VecT(ty) | Type::OptionVecT(ty) => quote! {
#bind.as_mut().unwrap().push(<#ty as strong_xml::XmlRead>::from_reader(reader)?);
},
_ => panic!("`child` + `container` attribute only supports Vec<T> and Option<Vec<T>>."),
};

quote! {
reader.next().unwrap()?;

if #bind.is_some() {
return Err(XmlError::DuplicateField {
field: #container_tag.to_owned(),
});
}

while let Some(_) = reader.find_attribute()? {};

#bind = Some(Vec::new());
if let Token::ElementEnd { end: ElementEnd::Open, .. } = reader.next().unwrap()? {
while let Some(__tag) = reader.find_element_start(Some(#container_tag))? {
match __tag {
#( #tags )|* => {
strong_xml::log_start_reading_field!(#ele_name, #name);
#inner_reader
strong_xml::log_finish_reading_field!(#ele_name, #name);
}
tag => {
strong_xml::log_skip_element!(#ele_name, tag);
// skip the start tag
reader.next();
reader.read_to_end(tag)?;
},
}
}
}

}
} else {
match &ty {
Type::VecT(ty) => quote! {
#bind.push(<#ty as strong_xml::XmlRead>::from_reader(reader)?);
},
Type::OptionT(ty) | Type::T(ty) => quote! {
if #bind.is_some() {
return Err(XmlError::DuplicateField {
field: stringify!(#( #tags )|*).to_owned(),
});
}
#bind = Some(<#ty as strong_xml::XmlRead>::from_reader(reader)?);
},
_ => panic!("`child` attribute only supports Vec<T>, Option<T> and T."),
}
};

quote! {
#( #tags )|* => {
#match_tags => {
strong_xml::log_start_reading_field!(#ele_name, #name);

#from_reader
Expand All @@ -246,24 +327,64 @@ fn read_flatten_text(
bind: &Ident,
name: &TokenStream,
ty: &Type,
container_tag: Option<&LitStr>,
ele_name: &TokenStream,
) -> TokenStream {
let match_tag = container_tag.unwrap_or(tag);

let from_str = from_str(ty);

let read_text = if ty.is_vec() {
let read_text = if let Some(container_tag) = container_tag {
quote! {
if #bind.is_some() {
return Err(XmlError::DuplicateField {
field: #container_tag.to_owned(),
});
}

while let Some(_) = reader.find_attribute()? {};

#bind = Some(Vec::new());
if let Token::ElementEnd { end: ElementEnd::Open, .. } = reader.next().unwrap()? {
while let Some(__tag) = reader.find_element_start(Some(#container_tag))? {
match __tag {
#tag => {
strong_xml::log_start_reading_field!(#ele_name, #name);
reader.next().unwrap()?;
let __value = reader.read_text(#tag)?;
#bind.as_mut().unwrap().push(#from_str);
strong_xml::log_finish_reading_field!(#ele_name, #name);
}
tag => {
strong_xml::log_skip_element!(#ele_name, tag);
// skip the start tag
reader.next();
reader.read_to_end(tag)?;
},
}
}
}

}
} else if ty.is_vec() {
quote! {
let __value = reader.read_text(#tag)?;
#bind.push(#from_str);
}
} else {
quote! {
if #bind.is_some() {
return Err(XmlError::DuplicateField {
field: #tag.to_owned(),
});
}
let __value = reader.read_text(#tag)?;
#bind = Some(#from_str);
}
};

quote! {
#tag => {
#match_tag => {
// skip element start
reader.next();

Expand All @@ -278,15 +399,17 @@ fn read_flatten_text(

fn from_str(ty: &Type) -> TokenStream {
match &ty {
Type::CowStr | Type::OptionCowStr | Type::VecCowStr => quote! { __value },
Type::Bool | Type::OptionBool | Type::VecBool => quote! {
Type::CowStr | Type::OptionCowStr | Type::VecCowStr | Type::OptionVecCowStr => {
quote! { __value }
}
Type::Bool | Type::OptionBool | Type::VecBool | Type::OptionVecBool => quote! {
match &*__value {
"t" | "true" | "y" | "yes" | "on" | "1" => true,
"f" | "false" | "n" | "no" | "off" | "0" => false,
_ => <bool as std::str::FromStr>::from_str(&__value).map_err(|e| XmlError::FromStr(e.into()))?
}
},
Type::T(ty) | Type::OptionT(ty) | Type::VecT(ty) => quote! {
Type::T(ty) | Type::OptionT(ty) | Type::VecT(ty) | Type::OptionVecT(ty) => quote! {
<#ty as std::str::FromStr>::from_str(&__value).map_err(|e| XmlError::FromStr(e.into()))?
},
}
Expand Down
Loading