user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rework macro to prepare for more modifiers than just [pub]

Browse source
This commit is contained in:
Niko Matsakis 2017-04-28 09:40:48 -04:00
parent 29263fdb54
commit ecc8ff9199
1 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/librustc/ty/maps.rs
View file

@ -353,11 +353,11 @@ impl<'tcx> QueryDescription for queries::mir_pass<'tcx> {
macro_rules! define_maps {
(<$tcx:tt>
$($(#[$attr:meta])*
[$($pub:tt)*] $name:ident: $node:ident($K:ty) -> $V:ty,)*) => {
pub struct Maps<$tcx> {
providers: IndexVec<CrateNum, Providers<$tcx>>,
query_stack: RefCell<Vec<(Span, Query<$tcx>)>>,
$($(#[$attr])* $($pub)* $name: RefCell<DepTrackingMap<queries::$name<$tcx>>>),*
[$($modifiers:tt)*] $name:ident: $node:ident($K:ty) -> $V:ty,)*) => {
define_map_struct! {
tcx: $tcx,
input: ($(([$($attr)*] [$($modifiers)*] $name))*),
output: ()
}
impl<$tcx> Maps<$tcx> {
@ -519,6 +519,41 @@ macro_rules! define_maps {
}
}
macro_rules! define_map_struct {
(tcx: $tcx:tt,
input: (),
output: ($($output:tt)*)) => {
pub struct Maps<$tcx> {
providers: IndexVec<CrateNum, Providers<$tcx>>,
query_stack: RefCell<Vec<(Span, Query<$tcx>)>>,
$($output)*
}
};
// Detect things with the `pub` modifier
(tcx: $tcx:tt,
input: (([$($attr:meta)*] [pub] $name:ident) $($input:tt)*),
output: ($($output:tt)*)) => {
define_map_struct! {
tcx: $tcx,
input: ($($input)*),
output: ($($output)*
$(#[$attr])* pub $name: RefCell<DepTrackingMap<queries::$name<$tcx>>>,)
}
};
(tcx: $tcx:tt,
input: (([$($attr:meta)*] [$($modifiers:tt)*] $name:ident) $($input:tt)*),
output: ($($output:tt)*)) => {
define_map_struct! {
tcx: $tcx,
input: ($($input)*),
output: ($($output)*
$(#[$attr])* $name: RefCell<DepTrackingMap<queries::$name<$tcx>>>,)
}
};
}
// Each of these maps also corresponds to a method on a
// `Provider` trait for requesting a value of that type,
// and a method on `Maps` itself for doing that in a