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

use inclusive ranges in legion system fn macro

Browse Source
This commit is contained in:
Carter Anderson 2020-05-28 09:19:39 -07:00
parent 5b6001a413
commit b96fec5f44
1 changed files with 32 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
crates/bevy_legion/legion_fn_system_macro/src/lib.rs
View File

@ -6,49 +6,42 @@ use quote::quote;
use syn::Ident; use syn::Ident;
fn tuple(idents: &[Ident]) -> proc_macro2::TokenStream {
if idents.len() == 0 {
quote!{ ()}
} else if idents.len() == 1 {
quote!{ #(#idents),* }
} else {
quote!{ (#(#idents),*) }
}
}
fn get_idents(fmt_string: fn(usize)->String, count: usize) -> Vec<Ident> {
(0..=count)
.map(|i| Ident::new(&fmt_string(i), Span::call_site()))
.collect::<Vec<Ident>>()
}
#[proc_macro] #[proc_macro]
pub fn impl_fn_systems(_input: TokenStream) -> TokenStream { pub fn impl_fn_systems(_input: TokenStream) -> TokenStream {
let max_resources = 8; let max_resources = 8;
let max_views = 8; let max_views = 8;
let resources = (0..max_resources) let resources = get_idents(|i| format!("R{}", i), max_resources);
.map(|i| Ident::new(&format!("R{}", i), Span::call_site())) let resource_vars = get_idents(|i| format!("r{}", i), max_resources);
.collect::<Vec<Ident>>(); let views = get_idents(|i| format!("V{}", i), max_views);
let resource_vars = (0..max_resources) let view_vars = get_idents(|i| format!("v{}", i), max_views);
.map(|i| Ident::new(&format!("r{}", i), Span::call_site())) let filters = get_idents(|i| format!("VF{}", i), max_views);
.collect::<Vec<Ident>>();
let views = (0..max_views)
.map(|i| Ident::new(&format!("V{}", i), Span::call_site()))
.collect::<Vec<Ident>>();
let view_vars = (0..max_views)
.map(|i| Ident::new(&format!("v{}", i), Span::call_site()))
.collect::<Vec<Ident>>();
let filter_idents = (0..max_views)
.map(|i| Ident::new(&format!("VF{}", i), Span::call_site()))
.collect::<Vec<Ident>>();
let mut tokens = TokenStream::new(); let mut tokens = TokenStream::new();
let command_buffer = vec![Ident::new("CommandBuffer", Span::call_site())]; let command_buffer = vec![Ident::new("CommandBuffer", Span::call_site())];
let command_buffer_var = vec![Ident::new("_command_buffer", Span::call_site())]; let command_buffer_var = vec![Ident::new("_command_buffer", Span::call_site())];
for resource_count in 0..max_resources { for resource_count in 0..=max_resources {
let resource = &resources[0..resource_count]; let resource = &resources[0..resource_count];
let resource_var = &resource_vars[0..resource_count]; let resource_var = &resource_vars[0..resource_count];
let resource_tuple = if resource_count == 0 { let resource_tuple = tuple(resource);
quote!{ ()} let resource_var_tuple = tuple(resource_var);
} else if resource_count == 1 {
quote!{ #(#resource),* }
} else {
quote!{ (#(#resource),*) }
};
let resource_var_tuple = if resource_count == 0 {
quote!{ ()}
} else if resource_count == 1 {
quote!{ #(#resource_var),* }
} else {
quote!{ (#(#resource_var),*) }
};
let resource_access = if resource_count == 0 { let resource_access = if resource_count == 0 {
quote! { Access::default() } quote! { Access::default() }
@ -65,18 +58,12 @@ pub fn impl_fn_systems(_input: TokenStream) -> TokenStream {
}} }}
}; };
for view_count in 0..max_views { for view_count in 0..=max_views {
let view = &views[0..view_count]; let view = &views[0..view_count];
let view_var = &view_vars[0..view_count]; let view_var = &view_vars[0..view_count];
let filter = &filter_idents[0..view_count]; let filter = &filters[0..view_count];
let view_tuple = if view_count == 0 { let view_tuple = tuple(view);
quote!{ ()}
} else if view_count == 1 {
quote!{ #(#view),* }
} else {
quote!{ (#(#view),*) }
};
let component_access = if view_count == 0 { let component_access = if view_count == 0 {
quote! { Access::default() } quote! { Access::default() }
@ -139,11 +126,11 @@ pub fn impl_fn_systems(_input: TokenStream) -> TokenStream {
tokens.extend(TokenStream::from(quote! { tokens.extend(TokenStream::from(quote! {
impl<'a, impl<'a,
Func, Func,
#(#resource: ResourceSet<PreparedResources = #resource> + 'static + Clone,)* #(#resource: ResourceSet<PreparedResources = #resource> + 'static + Clone,)*
#(#view: for<'b> View<'b> + DefaultFilter<Filter = #filter> + ViewElement, #(#view: for<'b> View<'b> + DefaultFilter<Filter = #filter> + ViewElement,
#filter: EntityFilter + Sync + 'static),* #filter: EntityFilter + Sync + 'static),*
> IntoSystem<'a, (#(#command_buffer)*), (#(#resource,)*), (#(#view,)*)> for Func > IntoSystem<'a, (#(#command_buffer)*), (#(#resource,)*), (#(#view,)*)> for Func
where where
Func: FnMut(#(&mut #command_buffer,)* #(#resource,)* #(#view),*) + Send + Sync + 'static, Func: FnMut(#(&mut #command_buffer,)* #(#resource,)* #(#view),*) + Send + Sync + 'static,
#(<#view as View<'a>>::Iter: Iterator<Item = #view>),* #(<#view as View<'a>>::Iter: Iterator<Item = #view>),*
@ -189,8 +176,6 @@ pub fn impl_fn_systems(_input: TokenStream) -> TokenStream {
} }
})); }));
} }
} }
} }