diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-04 17:21:41 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-04 17:21:41 +0000 |
commit | d9fb01f803671bfb6fca6b873bd140d8177ecb1c (patch) | |
tree | 9a1a0b696749d4d079ff0744272f78f497caae29 /crates/ra_mbe/src/tests.rs | |
parent | cc2d75d0f88bdcb1b3e20db36decb6ee6eca517a (diff) | |
parent | a5839662f448602d6aa2d724432844fc2d08947e (diff) |
Merge #2173
2173: MBE: Add TokenId shift in macro_rules r=matklad a=edwin0cheng
As discussed in #2169 , for fixing duplication TokenId during expansion :
> What we can do here is to re-number the tokens during expansion. Specifically:
> * when we create macro_rules, we note the highest id of the token we have as shift>
> * when we expand macro rules, if we need to output a token from definition, we just re-use its id
> * if we need to output a token from the argument, we increase its id by shift (so it's guaranteed to not to collide with anything from the definition)
> * finally, when we have a HirFileId of the expansion, we can look up the original value of shift and classify node to the arg/def by comparing it's id with shift.
>
This PR implement first 3 points of above solution.
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_mbe/src/tests.rs')
-rw-r--r-- | crates/ra_mbe/src/tests.rs | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index f34ab52e1..a23e3afe3 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs | |||
@@ -59,6 +59,33 @@ mod rule_parsing { | |||
59 | // * Make it pass :-) | 59 | // * Make it pass :-) |
60 | 60 | ||
61 | #[test] | 61 | #[test] |
62 | fn test_token_id_shift() { | ||
63 | let macro_definition = r#" | ||
64 | macro_rules! foobar { | ||
65 | ($e:ident) => { foo bar $e } | ||
66 | } | ||
67 | "#; | ||
68 | let rules = create_rules(macro_definition); | ||
69 | let expansion = expand(&rules, "foobar!(baz);"); | ||
70 | |||
71 | fn get_id(t: &tt::TokenTree) -> Option<u32> { | ||
72 | if let tt::TokenTree::Leaf(tt::Leaf::Ident(ident)) = t { | ||
73 | return Some(ident.id.0); | ||
74 | } | ||
75 | None | ||
76 | } | ||
77 | |||
78 | assert_eq!(expansion.token_trees.len(), 3); | ||
79 | // ($e:ident) => { foo bar $e } | ||
80 | // 0 1 2 3 4 | ||
81 | assert_eq!(get_id(&expansion.token_trees[0]), Some(2)); | ||
82 | assert_eq!(get_id(&expansion.token_trees[1]), Some(3)); | ||
83 | |||
84 | // So baz should be 5 | ||
85 | assert_eq!(get_id(&expansion.token_trees[2]), Some(5)); | ||
86 | } | ||
87 | |||
88 | #[test] | ||
62 | fn test_convert_tt() { | 89 | fn test_convert_tt() { |
63 | let macro_definition = r#" | 90 | let macro_definition = r#" |
64 | macro_rules! impl_froms { | 91 | macro_rules! impl_froms { |