mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-23 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

introduce a GetQueryTable trait and use to get the query tables

Browse source
This commit is contained in:
Niko Matsakis 2018-10-05 05:15:21 -04:00
parent 84dca313f7
commit d6c7080877
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/lib.rs
View file

@ -64,6 +64,10 @@ pub trait Query<DB: Database>: Debug + Default + Sized + 'static {
type Storage: QueryStorageOps<DB, Self> + Send + Sync; type Storage: QueryStorageOps<DB, Self> + Send + Sync;
} }
pub trait GetQueryTable<Q: Query<Self>>: Database {
fn get_query_table(db: &Self) -> QueryTable<'_, Self, Q>;
}
pub trait QueryStorageOps<DB, Q>: Default pub trait QueryStorageOps<DB, Q>: Default
where where
DB: Database, DB: Database,
@ -232,7 +236,17 @@ impl DefaultKey for () {
#[macro_export] #[macro_export]
macro_rules! query_prototype { macro_rules! query_prototype {
( (
$(#[$attr:meta])* $v:vis trait $name:ident $($t:tt)* $(#[$attr:meta])* $v:vis trait $name:ident { $($t:tt)* }
) => {
$crate::query_prototype! {
attr[$(#[$attr])*];
headers[$v, $name, ];
tokens[{ $($t)* }];
}
};
(
$(#[$attr:meta])* $v:vis trait $name:ident : $($t:tt)*
) => { ) => {
$crate::query_prototype! { $crate::query_prototype! {
attr[$(#[$attr])*]; attr[$(#[$attr])*];
@ -241,6 +255,7 @@ macro_rules! query_prototype {
} }
}; };
// Base case: found the trait body
( (
attr[$($trait_attr:tt)*]; attr[$($trait_attr:tt)*];
headers[$v:vis, $name:ident, $($header:tt)*]; headers[$v:vis, $name:ident, $($header:tt)*];
@ -251,14 +266,18 @@ macro_rules! query_prototype {
)* )*
}]; }];
) => { ) => {
$($trait_attr)* $v trait $name $($header)* { $($trait_attr)* $v trait $name: $($crate::GetQueryTable<$query_type> +)* $($header)* {
$( $(
$(#[$method_attr])* $(#[$method_attr])*
fn $method_name(&self) -> $crate::QueryTable<'_, Self, $query_type>; fn $method_name(&self) -> $crate::QueryTable<'_, Self, $query_type> {
<Self as $crate::GetQueryTable<$query_type>>::get_query_table(self)
}
)* )*
} }
}; };
// Recursive case: found some more part of the trait header.
// Keep pulling out tokens until we find the body.
( (
attr[$($attr:tt)*]; attr[$($attr:tt)*];
headers[$($headers:tt)*]; headers[$($headers:tt)*];
@ -554,14 +573,16 @@ macro_rules! database_storage {
} }
$( $(
impl $TraitName for $Database { impl $TraitName for $Database { }
$( $(
fn $query_method( impl $crate::GetQueryTable<$QueryType> for $Database {
&self, fn get_query_table(
db: &Self,
) -> $crate::QueryTable<'_, Self, $QueryType> { ) -> $crate::QueryTable<'_, Self, $QueryType> {
$crate::QueryTable::new( $crate::QueryTable::new(
self, db,
&$crate::Database::salsa_runtime(self) &$crate::Database::salsa_runtime(db)
.storage() .storage()
.$query_method, .$query_method,
|_, key| { |_, key| {
@ -572,8 +593,8 @@ macro_rules! database_storage {
}, },
) )
} }
)*
} }
)* )*
)*
}; };
} }