Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Details about macro NestingState hit and at_end fields

Browse source
This commit is contained in:
Vincent Rouillé 2019-12-30 17:07:23 +01:00
parent 6d84dee4e7
commit c670a15345
No known key found for this signature in database
GPG key ID: FCA513373403B851
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_mbe/src/mbe_expander/transcriber.rs
View file

@ -18,16 +18,16 @@ impl Bindings {
let mut b = self.inner.get(name).ok_or_else(|| { let mut b = self.inner.get(name).ok_or_else(|| {
ExpandError::BindingError(format!("could not find binding `{}`", name)) ExpandError::BindingError(format!("could not find binding `{}`", name))
})?; })?;
for s in nesting.iter_mut() { for nesting_state in nesting.iter_mut() {
s.hit = true; nesting_state.hit = true;
b = match b { b = match b {
Binding::Fragment(_) => break, Binding::Fragment(_) => break,
Binding::Nested(bs) => bs.get(s.idx).ok_or_else(|| { Binding::Nested(bs) => bs.get(nesting_state.idx).ok_or_else(|| {
s.at_end = true; nesting_state.at_end = true;
ExpandError::BindingError(format!("could not find nested binding `{}`", name)) ExpandError::BindingError(format!("could not find nested binding `{}`", name))
})?, })?,
Binding::Empty => { Binding::Empty => {
s.at_end = true; nesting_state.at_end = true;
return Err(ExpandError::BindingError(format!( return Err(ExpandError::BindingError(format!(
"could not find empty binding `{}`", "could not find empty binding `{}`",
name name
@ -61,7 +61,11 @@ pub(super) fn transcribe(
#[derive(Debug)] #[derive(Debug)]
struct NestingState { struct NestingState {
idx: usize, idx: usize,
/// `hit` is currently necessary to tell `expand_repeat` if it should stop
/// because there is no variable in use by the current repetition
hit: bool, hit: bool,
/// `at_end` is currently necessary to tell `expand_repeat` if it should stop
/// because there is no more value avaible for the current repetition
at_end: bool, at_end: bool,
} }
@ -130,8 +134,7 @@ fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> Result<Fragment, ExpandError>
.into(); .into();
Fragment::Tokens(tt) Fragment::Tokens(tt)
} else { } else {
let fragment = ctx.bindings.get(&v, &mut ctx.nesting)?.clone(); ctx.bindings.get(&v, &mut ctx.nesting)?.clone()
fragment
}; };
Ok(res) Ok(res)
} }