xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xso-proc: add support for optional children

Browse source
This commit is contained in:
Jonas Schäfer 2024-06-30 09:21:46 +02:00
commit 01336802b4
6 changed files with 133 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
xso-proc/src/field.rs
View file

@ -152,7 +152,11 @@ enum FieldKind {
},
/// The field maps to a child
Child,
Child {
// Flag indicating whether the value should be defaulted if the
// child is absent.
default_: Flag,
},
}
impl FieldKind {
@ -199,7 +203,7 @@ impl FieldKind {
XmlFieldMeta::Text { codec } => Ok(Self::Text { codec }),
XmlFieldMeta::Child => Ok(Self::Child),
XmlFieldMeta::Child { default_ } => Ok(Self::Child { default_ }),
}
}
}
@ -341,7 +345,7 @@ impl FieldDef {
})
}
FieldKind::Child => {
FieldKind::Child { ref default_ } => {
let FromEventsScope {
ref substate_result,
..
@ -353,6 +357,18 @@ impl FieldDef {
let from_events = from_events_fn(self.ty.clone());
let from_xml_builder = from_xml_builder_ty(self.ty.clone());
let on_absent = match default_ {
Flag::Absent => quote! {
return ::core::result::Result::Err(::xso::error::Error::Other(#missing_msg).into())
},
Flag::Present(_) => {
let default_ = default_fn(self.ty.clone());
quote! {
#default_()
}
}
};
Ok(FieldBuilderPart::Nested {
value: FieldTempInit {
init: quote! { ::std::option::Option::None },
@ -368,7 +384,7 @@ impl FieldDef {
finalize: quote! {
match #field_access {
::std::option::Option::Some(value) => value,
::std::option::Option::None => return ::core::result::Result::Err(::xso::error::Error::Other(#missing_msg).into()),
::std::option::Option::None => #on_absent,
}
},
})
@ -426,7 +442,7 @@ impl FieldDef {
Ok(FieldIteratorPart::Text { generator })
}
FieldKind::Child => {
FieldKind::Child { default_: _ } => {
let AsItemsScope { ref lifetime, .. } = scope;
let as_xml_iter = as_xml_iter_fn(self.ty.clone());