Skip to content
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

Jump to bottom

Don't clutter caller namespace with derive(Query) internals #326

Merged
merged 1 commit into from
Jun 24, 2023
Merged

Don't clutter caller namespace with derive(Query) internals #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
118 changes: 59 additions & 59 deletions macros/src/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn derive(input: DeriveInput) -> Result<TokenStream2> {
.iter()
.map(|ty| quote! { <#ty as ::hecs::Query>::Fetch })
.collect::<Vec<_>>();
let fetch_ident = Ident::new(&format!("__HecsInternal{}Fetch", ident), Span::call_site());
let fetch_ident = Ident::new(&format!("{}Fetch", ident), Span::call_site());
let fetch = match data.fields {
syn::Fields::Named(_) => quote! {
#vis struct #fetch_ident {
Expand All @@ -83,7 +83,7 @@ pub fn derive(input: DeriveInput) -> Result<TokenStream2> {
#vis struct #fetch_ident;
},
};
let state_ident = Ident::new(&format!("__HecsInternal{}State", ident), Span::call_site());
let state_ident = Ident::new(&format!("{}State", ident), Span::call_site());
let state = match data.fields {
syn::Fields::Named(_) => quote! {
#[derive(Clone, Copy)]
Expand Down Expand Up @@ -114,81 +114,81 @@ pub fn derive(input: DeriveInput) -> Result<TokenStream2> {
.collect::<Vec<_>>();

Ok(quote! {
impl<'a> ::hecs::Query for #ident<'a> {
type Item<'q> = #ident<'q>;
const _: () = {
#fetch

type Fetch = #fetch_ident;
impl<'a> ::hecs::Query for #ident<'a> {
type Item<'q> = #ident<'q>;

#[allow(unused_variables)]
unsafe fn get<'q>(fetch: &Self::Fetch, n: usize) -> Self::Item<'q> {
#(
let #intermediates: <#queries as ::hecs::Query>::Item<'q> = <#queries as ::hecs::Query>::get(&fetch.#fields, n);
)*
#ident {#(#fields: #intermediates,)*}
type Fetch = #fetch_ident;

#[allow(unused_variables)]
unsafe fn get<'q>(fetch: &Self::Fetch, n: usize) -> Self::Item<'q> {
#(
let #intermediates: <#queries as ::hecs::Query>::Item<'q> = <#queries as ::hecs::Query>::get(&fetch.#fields, n);
)*
#ident {#(#fields: #intermediates,)*}
}
}
}

#[doc(hidden)]
#fetch
#state

#[doc(hidden)]
#state
unsafe impl ::hecs::Fetch for #fetch_ident {
type State = #state_ident;

unsafe impl ::hecs::Fetch for #fetch_ident {
type State = #state_ident;
fn dangling() -> Self {
Self {
#(
#fields: #fetches::dangling(),
)*
}
}

fn dangling() -> Self {
Self {
#[allow(unused_variables, unused_mut)]
fn access(archetype: &::hecs::Archetype) -> ::std::option::Option<::hecs::Access> {
let mut access = ::hecs::Access::Iterate;
#(
#fields: #fetches::dangling(),
access = ::core::cmp::max(access, #fetches::access(archetype)?);
)*
::std::option::Option::Some(access)
}
}

#[allow(unused_variables, unused_mut)]
fn access(archetype: &::hecs::Archetype) -> ::std::option::Option<::hecs::Access> {
let mut access = ::hecs::Access::Iterate;
#(
access = ::core::cmp::max(access, #fetches::access(archetype)?);
)*
::std::option::Option::Some(access)
}
#[allow(unused_variables)]
fn borrow(archetype: &::hecs::Archetype, state: Self::State) {
#(#fetches::borrow(archetype, state.#fields);)*
}

#[allow(unused_variables)]
fn borrow(archetype: &::hecs::Archetype, state: Self::State) {
#(#fetches::borrow(archetype, state.#fields);)*
}
#[allow(unused_variables)]
fn prepare(archetype: &::hecs::Archetype) -> ::std::option::Option<Self::State> {
::std::option::Option::Some(#state_ident {
#(
#fields: #fetches::prepare(archetype)?,
)*
})
}

#[allow(unused_variables)]
fn prepare(archetype: &::hecs::Archetype) -> ::std::option::Option<Self::State> {
::std::option::Option::Some(#state_ident {
#(
#fields: #fetches::prepare(archetype)?,
)*
})
}
#[allow(unused_variables)]
fn execute(archetype: &::hecs::Archetype, state: Self::State) -> Self {
Self {
#(
#fields: #fetches::execute(archetype, state.#fields),
)*
}
}

#[allow(unused_variables)]
fn release(archetype: &::hecs::Archetype, state: Self::State) {
#(#fetches::release(archetype, state.#fields);)*
}

#[allow(unused_variables)]
fn execute(archetype: &::hecs::Archetype, state: Self::State) -> Self {
Self {
#[allow(unused_variables, unused_mut)]
fn for_each_borrow(mut f: impl ::core::ops::FnMut(::core::any::TypeId, bool)) {
#(
#fields: #fetches::execute(archetype, state.#fields),
<#fetches as ::hecs::Fetch>::for_each_borrow(&mut f);
)*
}
}

#[allow(unused_variables)]
fn release(archetype: &::hecs::Archetype, state: Self::State) {
#(#fetches::release(archetype, state.#fields);)*
}

#[allow(unused_variables, unused_mut)]
fn for_each_borrow(mut f: impl ::core::ops::FnMut(::core::any::TypeId, bool)) {
#(
<#fetches as ::hecs::Fetch>::for_each_borrow(&mut f);
)*
}
}
};
})
}

Expand Down
Loading