diff options
Diffstat (limited to 'crates/ra_mbe/src/mbe_expander.rs')
-rw-r--r-- | crates/ra_mbe/src/mbe_expander.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs index b2faa86d2..c2a5702f0 100644 --- a/crates/ra_mbe/src/mbe_expander.rs +++ b/crates/ra_mbe/src/mbe_expander.rs | |||
@@ -11,6 +11,7 @@ use rustc_hash::FxHashMap; | |||
11 | use crate::{ExpandError, ExpandResult}; | 11 | use crate::{ExpandError, ExpandResult}; |
12 | 12 | ||
13 | pub(crate) fn expand(rules: &crate::MacroRules, input: &tt::Subtree) -> ExpandResult<tt::Subtree> { | 13 | pub(crate) fn expand(rules: &crate::MacroRules, input: &tt::Subtree) -> ExpandResult<tt::Subtree> { |
14 | eprintln!("expanding input: {:?}", input); | ||
14 | let (mut result, mut unmatched_tokens, mut unmatched_patterns, mut err) = ( | 15 | let (mut result, mut unmatched_tokens, mut unmatched_patterns, mut err) = ( |
15 | tt::Subtree::default(), | 16 | tt::Subtree::default(), |
16 | usize::max_value(), | 17 | usize::max_value(), |
@@ -39,9 +40,8 @@ fn expand_rule( | |||
39 | rule: &crate::Rule, | 40 | rule: &crate::Rule, |
40 | input: &tt::Subtree, | 41 | input: &tt::Subtree, |
41 | ) -> ExpandResult<(tt::Subtree, usize, usize)> { | 42 | ) -> ExpandResult<(tt::Subtree, usize, usize)> { |
42 | dbg!(&rule.lhs); | 43 | let (match_result, bindings_err) = matcher::match_(&rule.lhs, input); |
43 | let (match_result, bindings_err) = dbg!(matcher::match_(&rule.lhs, input)); | 44 | let (res, transcribe_err) = transcriber::transcribe(&rule.rhs, &match_result.bindings); |
44 | let (res, transcribe_err) = dbg!(transcriber::transcribe(&rule.rhs, &match_result.bindings)); | ||
45 | ( | 45 | ( |
46 | (res, match_result.unmatched_tokens, match_result.unmatched_patterns), | 46 | (res, match_result.unmatched_tokens, match_result.unmatched_patterns), |
47 | bindings_err.or(transcribe_err), | 47 | bindings_err.or(transcribe_err), |