aboutsummaryrefslogtreecommitdiff
path: root/crates/mbe
diff options
context:
space:
mode:
authorJonas Schievink <[email protected]>2021-01-03 10:47:57 +0000
committerGitHub <[email protected]>2021-01-03 10:47:57 +0000
commit85cc3cfec99a7d232384efae010bfbc8224f1351 (patch)
treef02b994b580aacd64a3b8172a17fa464a52b4713 /crates/mbe
parent354c1daedc91abd15ca0ce6ada417053ce45ecfa (diff)
Revert "Proper handling $crate and local_inner_macros"
Diffstat (limited to 'crates/mbe')
-rw-r--r--crates/mbe/src/mbe_expander/matcher.rs2
-rw-r--r--crates/mbe/src/mbe_expander/transcriber.rs20
-rw-r--r--crates/mbe/src/parser.rs11
3 files changed, 19 insertions, 14 deletions
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index 385b46601..ab5f87c48 100644
--- a/crates/mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
@@ -150,7 +150,7 @@ fn match_subtree(
150 res.add_err(err!("leftover tokens")); 150 res.add_err(err!("leftover tokens"));
151 } 151 }
152 } 152 }
153 Op::Var { name, kind, .. } => { 153 Op::Var { name, kind } => {
154 let kind = match kind { 154 let kind = match kind {
155 Some(k) => k, 155 Some(k) => k,
156 None => { 156 None => {
diff --git a/crates/mbe/src/mbe_expander/transcriber.rs b/crates/mbe/src/mbe_expander/transcriber.rs
index 57f3f104d..720531237 100644
--- a/crates/mbe/src/mbe_expander/transcriber.rs
+++ b/crates/mbe/src/mbe_expander/transcriber.rs
@@ -100,8 +100,8 @@ fn expand_subtree(
100 err = err.or(e); 100 err = err.or(e);
101 arena.push(tt.into()); 101 arena.push(tt.into());
102 } 102 }
103 Op::Var { name, id, .. } => { 103 Op::Var { name, .. } => {
104 let ExpandResult { value: fragment, err: e } = expand_var(ctx, &name, *id); 104 let ExpandResult { value: fragment, err: e } = expand_var(ctx, &name);
105 err = err.or(e); 105 err = err.or(e);
106 push_fragment(arena, fragment); 106 push_fragment(arena, fragment);
107 } 107 }
@@ -118,10 +118,12 @@ fn expand_subtree(
118 ExpandResult { value: tt::Subtree { delimiter: template.delimiter, token_trees: tts }, err } 118 ExpandResult { value: tt::Subtree { delimiter: template.delimiter, token_trees: tts }, err }
119} 119}
120 120
121fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr, id: tt::TokenId) -> ExpandResult<Fragment> { 121fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> ExpandResult<Fragment> {
122 if v == "crate" { 122 if v == "crate" {
123 // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path. 123 // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path.
124 let tt = tt::Leaf::from(tt::Ident { text: "$crate".into(), id }).into(); 124 let tt =
125 tt::Leaf::from(tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() })
126 .into();
125 ExpandResult::ok(Fragment::Tokens(tt)) 127 ExpandResult::ok(Fragment::Tokens(tt))
126 } else if !ctx.bindings.contains(v) { 128 } else if !ctx.bindings.contains(v) {
127 // Note that it is possible to have a `$var` inside a macro which is not bound. 129 // Note that it is possible to have a `$var` inside a macro which is not bound.
@@ -140,8 +142,14 @@ fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr, id: tt::TokenId) -> ExpandResult
140 let tt = tt::Subtree { 142 let tt = tt::Subtree {
141 delimiter: None, 143 delimiter: None,
142 token_trees: vec![ 144 token_trees: vec![
143 tt::Leaf::from(tt::Punct { char: '$', spacing: tt::Spacing::Alone, id }).into(), 145 tt::Leaf::from(tt::Punct {
144 tt::Leaf::from(tt::Ident { text: v.clone(), id }).into(), 146 char: '$',
147 spacing: tt::Spacing::Alone,
148 id: tt::TokenId::unspecified(),
149 })
150 .into(),
151 tt::Leaf::from(tt::Ident { text: v.clone(), id: tt::TokenId::unspecified() })
152 .into(),
145 ], 153 ],
146 } 154 }
147 .into(); 155 .into();
diff --git a/crates/mbe/src/parser.rs b/crates/mbe/src/parser.rs
index 77cc739b6..2f3ebc831 100644
--- a/crates/mbe/src/parser.rs
+++ b/crates/mbe/src/parser.rs
@@ -8,7 +8,7 @@ use crate::{tt_iter::TtIter, ExpandError, MetaTemplate};
8 8
9#[derive(Clone, Debug, PartialEq, Eq)] 9#[derive(Clone, Debug, PartialEq, Eq)]
10pub(crate) enum Op { 10pub(crate) enum Op {
11 Var { name: SmolStr, kind: Option<SmolStr>, id: tt::TokenId }, 11 Var { name: SmolStr, kind: Option<SmolStr> },
12 Repeat { subtree: MetaTemplate, kind: RepeatKind, separator: Option<Separator> }, 12 Repeat { subtree: MetaTemplate, kind: RepeatKind, separator: Option<Separator> },
13 Leaf(tt::Leaf), 13 Leaf(tt::Leaf),
14 Subtree(MetaTemplate), 14 Subtree(MetaTemplate),
@@ -106,21 +106,18 @@ fn next_op<'a>(first: &tt::TokenTree, src: &mut TtIter<'a>, mode: Mode) -> Resul
106 } 106 }
107 let name = UNDERSCORE.clone(); 107 let name = UNDERSCORE.clone();
108 let kind = eat_fragment_kind(src, mode)?; 108 let kind = eat_fragment_kind(src, mode)?;
109 let id = punct.id; 109 Op::Var { name, kind }
110 Op::Var { name, kind, id }
111 } 110 }
112 tt::Leaf::Ident(ident) => { 111 tt::Leaf::Ident(ident) => {
113 let name = ident.text.clone(); 112 let name = ident.text.clone();
114 let kind = eat_fragment_kind(src, mode)?; 113 let kind = eat_fragment_kind(src, mode)?;
115 let id = ident.id; 114 Op::Var { name, kind }
116 Op::Var { name, kind, id }
117 } 115 }
118 tt::Leaf::Literal(lit) => { 116 tt::Leaf::Literal(lit) => {
119 if is_boolean_literal(&lit) { 117 if is_boolean_literal(&lit) {
120 let name = lit.text.clone(); 118 let name = lit.text.clone();
121 let kind = eat_fragment_kind(src, mode)?; 119 let kind = eat_fragment_kind(src, mode)?;
122 let id = lit.id; 120 Op::Var { name, kind }
123 Op::Var { name, kind, id }
124 } else { 121 } else {
125 bail!("bad var 2"); 122 bail!("bad var 2");
126 } 123 }