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

nicer macro syntax

Browse source 
we give bad error messages if misused, though
This commit is contained in:
Niko Matsakis 2018-09-30 10:55:52 -04:00
parent 0846e6ebba
commit 6b5871c5af
2 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/lib.rs
View file

@ -304,22 +304,6 @@ macro_rules! query_definition {
} }
}; };
(
@filter_attrs {
input { #[storage(input)] $($input:tt)* };
storage { $storage:tt };
other_attrs { $($other_attrs:tt)* };
}
) => {
$crate::query_definition! {
@filter_attrs {
input { $($input)* };
storage { input };
other_attrs { $($other_attrs)* };
}
}
};
( (
@filter_attrs { @filter_attrs {
input { #[$attr:meta] $($input:tt)* }; input { #[$attr:meta] $($input:tt)* };
@ -336,6 +320,7 @@ macro_rules! query_definition {
} }
}; };
// Accept a "fn-like" query definition
( (
@filter_attrs { @filter_attrs {
input { input {
@ -368,6 +353,12 @@ macro_rules! query_definition {
} }
}; };
(
@storage_ty[$QC:ident, $Self:ident, default]
) => {
$crate::query_definition! { @storage_ty[$QC, $Self, memoized] }
};
( (
@storage_ty[$QC:ident, $Self:ident, memoized] @storage_ty[$QC:ident, $Self:ident, memoized]
) => { ) => {
@ -380,10 +371,32 @@ macro_rules! query_definition {
$crate::volatile::VolatileStorage $crate::volatile::VolatileStorage
}; };
// Accept a "field-like" query definition (input)
( (
@storage_ty[$QC:ident, $Self:ident, input] @filter_attrs {
input {
$v:vis $name:ident: Map<$key_ty:ty, $value_ty:ty>;
};
storage { default };
other_attrs { $($attrs:tt)* };
}
) => { ) => {
$crate::input::InputStorage<$QC, $Self> #[derive(Default, Debug)]
$($attrs)*
$v struct $name;
impl<QC> $crate::Query<QC> for $name
where
QC: $crate::QueryContext
{
type Key = $key_ty;
type Value = $value_ty;
type Storage = $crate::input::InputStorage<QC, Self>;
fn execute(_: &QC, _: $key_ty) -> $value_ty {
panic!("execute should never run for an input query")
}
}
}; };
// Various legal start states: // Various legal start states:
@ -393,7 +406,7 @@ macro_rules! query_definition {
$crate::query_definition! { $crate::query_definition! {
@filter_attrs { @filter_attrs {
input { # $($tokens)* }; input { # $($tokens)* };
storage { memoized }; storage { default };
other_attrs { }; other_attrs { };
} }
} }
@ -404,7 +417,7 @@ macro_rules! query_definition {
$crate::query_definition! { $crate::query_definition! {
@filter_attrs { @filter_attrs {
input { $v $name $($tokens)* }; input { $v $name $($tokens)* };
storage { memoized }; storage { default };
other_attrs { }; other_attrs { };
} }
} }

10
tests/incremental/memoized_inputs.rs
View file

@ -19,17 +19,11 @@ salsa::query_definition! {
} }
salsa::query_definition! { salsa::query_definition! {
#[storage(input)] crate Input1: Map<(), usize>;
crate Input1(_query: &impl MemoizedInputsContext, _value: ()) -> usize {
panic!("silly")
}
} }
salsa::query_definition! { salsa::query_definition! {
#[storage(input)] crate Input2: Map<(), usize>;
crate Input2(_query: &impl MemoizedInputsContext, _value: ()) -> usize {
panic!("silly")
}
} }
#[test] #[test]