Skip to content

Commit c1cb595

Browse files
jonas-schievinkjonas-schievink
committed
Move to upstream macro_rules! model
1 parent 39aae83 commit c1cb595

36 files changed

+322
-272
lines changed

‎Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ debug = 0 # Set this to 1 or 2 to get more useful backtraces in debugger.
2525
# chalk-solve = { path = "../chalk/chalk-solve" }
2626
# chalk-ir = { path = "../chalk/chalk-ir" }
2727
# chalk-recursive = { path = "../chalk/chalk-recursive" }
28+
29+
# ungrammar = { path = "../ungrammar" }

‎crates/completion/src/render/macro_.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ mod tests {
144144
use foo::<|>;
145145
//- /foo/lib.rs crate:foo
146146
#[macro_export]
147-
macro_rules frobnicate { () => () }
147+
macro_rules! frobnicate { () => () }
148148
"#,
149149
r#"
150150
use foo::frobnicate;
@@ -154,11 +154,11 @@ use foo::frobnicate;
154154
check_edit(
155155
"frobnicate!",
156156
r#"
157-
macro_rules frobnicate { () => () }
157+
macro_rules! frobnicate { () => () }
158158
fn main() { frob<|>!(); }
159159
"#,
160160
r#"
161-
macro_rules frobnicate { () => () }
161+
macro_rules! frobnicate { () => () }
162162
fn main() { frobnicate!(); }
163163
"#,
164164
);

‎crates/hir/src/has_source.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ impl HasSource for TypeAlias {
110110
}
111111
}
112112
impl HasSource for MacroDef {
113-
type Ast = ast::MacroCall;
114-
fn source(self, db: &dyn HirDatabase) -> InFile<ast::MacroCall> {
113+
type Ast = ast::MacroRules;
114+
fn source(self, db: &dyn HirDatabase) -> InFile<ast::MacroRules> {
115115
InFile {
116116
file_id: self.id.ast_id.expect("MacroDef without ast_id").file_id,
117117
value: self.id.ast_id.expect("MacroDef without ast_id").to_node(db.upcast()),

‎crates/hir/src/semantics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ to_def_impls![
723723
(crate::EnumVariant, ast::Variant, enum_variant_to_def),
724724
(crate::TypeParam, ast::TypeParam, type_param_to_def),
725725
(crate::LifetimeParam, ast::LifetimeParam, lifetime_param_to_def),
726-
(crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros
726+
(crate::MacroDef, ast::MacroRules, macro_rules_to_def),
727727
(crate::Local, ast::IdentPat, bind_pat_to_def),
728728
];
729729

‎crates/hir/src/semantics/source_to_def.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ impl SourceToDefCtx<'_, '_> {
149149
}
150150

151151
// FIXME: use DynMap as well?
152-
pub(super) fn macro_call_to_def(&mut self, src: InFile<ast::MacroCall>) -> Option<MacroDefId> {
152+
pub(super) fn macro_rules_to_def(
153+
&mut self,
154+
src: InFile<ast::MacroRules>,
155+
) -> Option<MacroDefId> {
153156
let kind = MacroDefKind::Declarative;
154157
let file_id = src.file_id.original_file(self.db.upcast());
155158
let krate = self.file_to_def(file_id)?.krate;

‎crates/hir_def/src/body/lower.rs

Lines changed: 69 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -566,66 +566,52 @@ impl ExprCollector<'_> {
566566
syntax_ptr: AstPtr<ast::Expr>,
567567
mut collector: F,
568568
) {
569-
if let Some(name) = e.is_macro_rules().map(|it| it.as_name()) {
570-
let mac = MacroDefId {
571-
krate: Some(self.expander.module.krate),
572-
ast_id: Some(self.expander.ast_id(&e)),
573-
kind: MacroDefKind::Declarative,
574-
local_inner: false,
575-
};
576-
self.body.item_scope.define_legacy_macro(name, mac);
569+
// File containing the macro call. Expansion errors will be attached here.
570+
let outer_file = self.expander.current_file_id;
577571

578-
// FIXME: do we still need to allocate this as missing ?
579-
collector(self, None);
580-
} else {
581-
// File containing the macro call. Expansion errors will be attached here.
582-
let outer_file = self.expander.current_file_id;
583-
584-
let macro_call = self.expander.to_source(AstPtr::new(&e));
585-
let res = self.expander.enter_expand(self.db, Some(&self.body.item_scope), e);
586-
587-
match &res.err {
588-
Some(ExpandError::UnresolvedProcMacro) => {
589-
self.source_map.diagnostics.push(BodyDiagnostic::UnresolvedProcMacro(
590-
UnresolvedProcMacro {
591-
file: outer_file,
592-
node: syntax_ptr.into(),
593-
precise_location: None,
594-
macro_name: None,
595-
},
596-
));
597-
}
598-
Some(err) => {
599-
self.source_map.diagnostics.push(BodyDiagnostic::MacroError(MacroError {
572+
let macro_call = self.expander.to_source(AstPtr::new(&e));
573+
let res = self.expander.enter_expand(self.db, Some(&self.body.item_scope), e);
574+
575+
match &res.err {
576+
Some(ExpandError::UnresolvedProcMacro) => {
577+
self.source_map.diagnostics.push(BodyDiagnostic::UnresolvedProcMacro(
578+
UnresolvedProcMacro {
600579
file: outer_file,
601580
node: syntax_ptr.into(),
602-
message: err.to_string(),
603-
}));
604-
}
605-
None => {}
581+
precise_location: None,
582+
macro_name: None,
583+
},
584+
));
585+
}
586+
Some(err) => {
587+
self.source_map.diagnostics.push(BodyDiagnostic::MacroError(MacroError {
588+
file: outer_file,
589+
node: syntax_ptr.into(),
590+
message: err.to_string(),
591+
}));
606592
}
593+
None => {}
594+
}
607595

608-
match res.value {
609-
Some((mark, expansion)) => {
610-
// FIXME: Statements are too complicated to recover from error for now.
611-
// It is because we don't have any hygenine for local variable expansion right now.
612-
if T::can_cast(syntax::SyntaxKind::MACRO_STMTS) && res.err.is_some() {
613-
self.expander.exit(self.db, mark);
614-
collector(self, None);
615-
} else {
616-
self.source_map
617-
.expansions
618-
.insert(macro_call, self.expander.current_file_id);
596+
match res.value {
597+
Some((mark, expansion)) => {
598+
// FIXME: Statements are too complicated to recover from error for now.
599+
// It is because we don't have any hygenine for local variable expansion right now.
600+
if T::can_cast(syntax::SyntaxKind::MACRO_STMTS) && res.err.is_some() {
601+
self.expander.exit(self.db, mark);
602+
collector(self, None);
603+
} else {
604+
self.source_map.expansions.insert(macro_call, self.expander.current_file_id);
619605

620-
let item_tree = self.db.item_tree(self.expander.current_file_id);
621-
self.item_trees.insert(self.expander.current_file_id, item_tree);
606+
let item_tree = self.db.item_tree(self.expander.current_file_id);
607+
self.item_trees.insert(self.expander.current_file_id, item_tree);
622608

623-
collector(self, Some(expansion));
624-
self.expander.exit(self.db, mark);
625-
}
609+
let id = collector(self, Some(expansion));
610+
self.expander.exit(self.db, mark);
611+
id
626612
}
627-
None => collector(self, None),
628613
}
614+
None => collector(self, None),
629615
}
630616
}
631617

@@ -785,26 +771,44 @@ impl ExprCollector<'_> {
785771
| ast::Item::ExternCrate(_)
786772
| ast::Item::Module(_)
787773
| ast::Item::MacroCall(_) => return None,
774+
ast::Item::MacroRules(def) => {
775+
return Some(Either::Right(def));
776+
}
788777
};
789778

790-
Some((def, name))
779+
Some(Either::Left((def, name)))
791780
})
792781
.collect::<Vec<_>>();
793782

794-
for (def, name) in items {
795-
self.body.item_scope.define_def(def);
796-
if let Some(name) = name {
797-
let vis = crate::visibility::Visibility::Public; // FIXME determine correctly
798-
let has_constructor = match def {
799-
ModuleDefId::AdtId(AdtId::StructId(s)) => {
800-
self.db.struct_data(s).variant_data.kind() != StructKind::Record
783+
for either in items {
784+
match either {
785+
Either::Left((def, name)) => {
786+
self.body.item_scope.define_def(def);
787+
if let Some(name) = name {
788+
let vis = crate::visibility::Visibility::Public; // FIXME determine correctly
789+
let has_constructor = match def {
790+
ModuleDefId::AdtId(AdtId::StructId(s)) => {
791+
self.db.struct_data(s).variant_data.kind() != StructKind::Record
792+
}
793+
_ => true,
794+
};
795+
self.body.item_scope.push_res(
796+
name.as_name(),
797+
crate::per_ns::PerNs::from_def(def, vis, has_constructor),
798+
);
801799
}
802-
_ => true,
803-
};
804-
self.body.item_scope.push_res(
805-
name.as_name(),
806-
crate::per_ns::PerNs::from_def(def, vis, has_constructor),
807-
);
800+
}
801+
Either::Right(e) => {
802+
let mac = MacroDefId {
803+
krate: Some(self.expander.module.krate),
804+
ast_id: Some(self.expander.ast_id(&e)),
805+
kind: MacroDefKind::Declarative,
806+
local_inner: false,
807+
};
808+
if let Some(name) = e.name() {
809+
self.body.item_scope.define_legacy_macro(name.as_name(), mac);
810+
}
811+
}
808812
}
809813
}
810814
}

‎crates/hir_def/src/item_tree.rs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ impl ItemTree {
142142
type_aliases,
143143
mods,
144144
macro_calls,
145+
macro_rules,
145146
exprs,
146147
vis,
147148
generics,
@@ -162,6 +163,7 @@ impl ItemTree {
162163
type_aliases.shrink_to_fit();
163164
mods.shrink_to_fit();
164165
macro_calls.shrink_to_fit();
166+
macro_rules.shrink_to_fit();
165167
exprs.shrink_to_fit();
166168

167169
vis.arena.shrink_to_fit();
@@ -280,6 +282,7 @@ struct ItemTreeData {
280282
type_aliases: Arena<TypeAlias>,
281283
mods: Arena<Mod>,
282284
macro_calls: Arena<MacroCall>,
285+
macro_rules: Arena<MacroRules>,
283286
exprs: Arena<Expr>,
284287

285288
vis: ItemVisibilities,
@@ -427,6 +430,7 @@ mod_items! {
427430
TypeAlias in type_aliases -> ast::TypeAlias,
428431
Mod in mods -> ast::Module,
429432
MacroCall in macro_calls -> ast::MacroCall,
433+
MacroRules in macro_rules -> ast::MacroRules,
430434
}
431435

432436
macro_rules! impl_index {
@@ -629,17 +633,22 @@ pub enum ModKind {
629633

630634
#[derive(Debug, Clone, Eq, PartialEq)]
631635
pub struct MacroCall {
632-
/// For `macro_rules!` declarations, this is the name of the declared macro.
633-
pub name: Option<Name>,
634636
/// Path to the called macro.
635637
pub path: ModPath,
638+
pub ast_id: FileAstId<ast::MacroCall>,
639+
}
640+
641+
#[derive(Debug, Clone, Eq, PartialEq)]
642+
pub struct MacroRules {
643+
/// For `macro_rules!` declarations, this is the name of the declared macro.
644+
pub name: Name,
636645
/// Has `#[macro_export]`.
637646
pub is_export: bool,
638647
/// Has `#[macro_export(local_inner_macros)]`.
639648
pub is_local_inner: bool,
640649
/// Has `#[rustc_builtin_macro]`.
641650
pub is_builtin: bool,
642-
pub ast_id: FileAstId<ast::MacroCall>,
651+
pub ast_id: FileAstId<ast::MacroRules>,
643652
}
644653

645654
// NB: There's no `FileAstId` for `Expr`. The only case where this would be useful is for array
@@ -670,7 +679,8 @@ impl ModItem {
670679
| ModItem::Static(_)
671680
| ModItem::Trait(_)
672681
| ModItem::Impl(_)
673-
| ModItem::Mod(_) => None,
682+
| ModItem::Mod(_)
683+
| ModItem::MacroRules(_) => None,
674684
ModItem::MacroCall(call) => Some(AssocItem::MacroCall(*call)),
675685
ModItem::Const(konst) => Some(AssocItem::Const(*konst)),
676686
ModItem::TypeAlias(alias) => Some(AssocItem::TypeAlias(*alias)),
@@ -697,6 +707,7 @@ impl ModItem {
697707
ModItem::TypeAlias(it) => tree[it.index].ast_id().upcast(),
698708
ModItem::Mod(it) => tree[it.index].ast_id().upcast(),
699709
ModItem::MacroCall(it) => tree[it.index].ast_id().upcast(),
710+
ModItem::MacroRules(it) => tree[it.index].ast_id().upcast(),
700711
}
701712
}
702713
}

‎crates/hir_def/src/item_tree/lower.rs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ impl Ctx {
8484
| ast::Item::Fn(_)
8585
| ast::Item::TypeAlias(_)
8686
| ast::Item::Const(_)
87-
| ast::Item::Static(_)
88-
| ast::Item::MacroCall(_) => {
87+
| ast::Item::Static(_) => {
8988
// Skip this if we're already collecting inner items. We'll descend into all nodes
9089
// already.
9190
if !inner {
@@ -98,7 +97,11 @@ impl Ctx {
9897
ast::Item::Trait(_) | ast::Item::Impl(_) | ast::Item::ExternBlock(_) => {}
9998

10099
// These don't have inner items.
101-
ast::Item::Module(_) | ast::Item::ExternCrate(_) | ast::Item::Use(_) => {}
100+
ast::Item::Module(_)
101+
| ast::Item::ExternCrate(_)
102+
| ast::Item::Use(_)
103+
| ast::Item::MacroCall(_)
104+
| ast::Item::MacroRules(_) => {}
102105
};
103106

104107
let attrs = Attrs::new(item, &self.hygiene);
@@ -118,6 +121,7 @@ impl Ctx {
118121
)),
119122
ast::Item::ExternCrate(ast) => self.lower_extern_crate(ast).map(Into::into),
120123
ast::Item::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into),
124+
ast::Item::MacroRules(ast) => self.lower_macro_rules(ast).map(Into::into),
121125
ast::Item::ExternBlock(ast) => {
122126
Some(ModItems(self.lower_extern_block(ast).into_iter().collect::<SmallVec<_>>()))
123127
}
@@ -525,9 +529,15 @@ impl Ctx {
525529
}
526530

527531
fn lower_macro_call(&mut self, m: &ast::MacroCall) -> Option<FileItemTreeId<MacroCall>> {
528-
let name = m.name().map(|it| it.as_name());
529-
let attrs = Attrs::new(m, &self.hygiene);
530532
let path = ModPath::from_src(m.path()?, &self.hygiene)?;
533+
let ast_id = self.source_ast_id_map.ast_id(m);
534+
let res = MacroCall { path, ast_id };
535+
Some(id(self.data().macro_calls.alloc(res)))
536+
}
537+
538+
fn lower_macro_rules(&mut self, m: &ast::MacroRules) -> Option<FileItemTreeId<MacroRules>> {
539+
let name = m.name().map(|it| it.as_name())?;
540+
let attrs = Attrs::new(m, &self.hygiene);
531541

532542
let ast_id = self.source_ast_id_map.ast_id(m);
533543

@@ -547,8 +557,8 @@ impl Ctx {
547557
};
548558

549559
let is_builtin = attrs.by_key("rustc_builtin_macro").exists();
550-
let res = MacroCall { name, path, is_export, is_builtin, is_local_inner, ast_id };
551-
Some(id(self.data().macro_calls.alloc(res)))
560+
let res = MacroRules { name, is_export, is_builtin, is_local_inner, ast_id };
561+
Some(id(self.data().macro_rules.alloc(res)))
552562
}
553563

554564
fn lower_extern_block(&mut self, block: &ast::ExternBlock) -> Vec<ModItem> {

0 commit comments

Comments
 (0)