forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

props: add support for tuple structs

Browse Source
This commit is contained in:
Carter Anderson 2020-05-25 16:35:46 -07:00
parent bab2ad335d
commit cb6638ba06
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/bevy_property/bevy_property_derive/src/lib.rs
View File

@ -6,7 +6,7 @@ use darling::FromMeta;
use modules::{get_modules, get_path}; use modules::{get_modules, get_path};
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Field, Fields}; use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Field, Fields, Member, Index};
#[derive(FromMeta, Debug, Default)] #[derive(FromMeta, Debug, Default)]
struct PropAttributeArgs { struct PropAttributeArgs {
@ -24,11 +24,16 @@ pub fn derive_properties(input: TokenStream) -> TokenStream {
fields: Fields::Named(fields), fields: Fields::Named(fields),
.. ..
}) => &fields.named, }) => &fields.named,
Data::Struct(DataStruct {
fields: Fields::Unnamed(fields),
..
}) => &fields.unnamed,
_ => panic!("expected a struct with named fields"), _ => panic!("expected a struct with named fields"),
}; };
let fields_and_args = fields let fields_and_args = fields
.iter() .iter()
.map(|f| { .enumerate()
.map(|(i, f)| {
( (
f, f,
f.attrs f.attrs
@ -40,31 +45,32 @@ pub fn derive_properties(input: TokenStream) -> TokenStream {
PropAttributeArgs::from_meta(&a.parse_meta().unwrap()) PropAttributeArgs::from_meta(&a.parse_meta().unwrap())
.unwrap_or_else(|_err| PropAttributeArgs::default()) .unwrap_or_else(|_err| PropAttributeArgs::default())
}), }),
i
) )
}) })
.collect::<Vec<(&Field, Option<PropAttributeArgs>)>>(); .collect::<Vec<(&Field, Option<PropAttributeArgs>, usize)>>();
let active_fields = fields_and_args let active_fields = fields_and_args
.iter() .iter()
.filter(|(_field, attrs)| { .filter(|(_field, attrs, i)| {
attrs.is_none() attrs.is_none()
|| match attrs.as_ref().unwrap().ignore { || match attrs.as_ref().unwrap().ignore {
Some(ignore) => !ignore, Some(ignore) => !ignore,
None => true, None => true,
} }
}) })
.map(|(f, _attr)| *f) .map(|(f, _attr, i)| (*f, *i))
.collect::<Vec<&Field>>(); .collect::<Vec<(&Field, usize)>>();
let modules = get_modules(&ast); let modules = get_modules(&ast);
let bevy_property_path = get_path(&modules.bevy_property); let bevy_property_path = get_path(&modules.bevy_property);
let field_names = active_fields let field_names = active_fields
.iter() .iter()
.map(|field| field.ident.as_ref().unwrap().to_string()) .map(|(field, index)| field.ident.as_ref().map(|i| i.to_string()).unwrap_or_else(|| index.to_string()))
.collect::<Vec<String>>(); .collect::<Vec<String>>();
let field_idents = active_fields let field_idents = active_fields
.iter() .iter()
.map(|field| field.ident.as_ref().unwrap()) .map(|(field, index)| field.ident.as_ref().map(|ident| Member::Named(ident.clone())).unwrap_or_else(|| Member::Unnamed(Index::from(*index))))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let field_count = active_fields.len(); let field_count = active_fields.len();
let field_indices = (0..field_count).collect::<Vec<usize>>(); let field_indices = (0..field_count).collect::<Vec<usize>>();

4
examples/scene/properties.rs
View File

@ -17,7 +17,7 @@ fn main() {
#[derive(Properties, Default)] #[derive(Properties, Default)]
pub struct Test { pub struct Test {
a: usize, a: usize,
hi: CustomProperty, custom: CustomProperty,
nested: Nested, nested: Nested,
} }
@ -63,7 +63,7 @@ impl AsProperties for CustomProperty {
fn setup(property_type_registry: Res<PropertyTypeRegistryContext>) { fn setup(property_type_registry: Res<PropertyTypeRegistryContext>) {
let mut test = Test { let mut test = Test {
a: 1, a: 1,
hi: CustomProperty { a: 10 }, custom: CustomProperty { a: 10 },
nested: Nested { b: 8 }, nested: Nested { b: 8 },
}; };