summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-10-28 22:30:57 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-10-28 22:30:57 +0800
commit2f62e331a2fc59ef8c94b840c75b6f549d01bbd7 (patch)
tree03cbd2192c2bfde4ad285bfcf5d5f8a119b09b1e
parent2ad506b0f4639f5f00909ed92cba7873aaf0951b (diff)
downloadmrust-2f62e331a2fc59ef8c94b840c75b6f549d01bbd7.tar.gz
Expand - Recurse when expanding in patterns
-rw-r--r--src/expand/mod.cpp1
-rw-r--r--src/resolve/absolute.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/expand/mod.cpp b/src/expand/mod.cpp
index 959cef86..9c9693cf 100644
--- a/src/expand/mod.cpp
+++ b/src/expand/mod.cpp
@@ -173,6 +173,7 @@ void Expand_Pattern(::AST::Crate& crate, LList<const AST::Module*> modstack, ::A
}
pat = mv$(newpat);
+ Expand_Pattern(crate, modstack, mod, pat, is_refutable);
),
(Any,
),
diff --git a/src/resolve/absolute.cpp b/src/resolve/absolute.cpp
index f3c68ffb..e9cf274e 100644
--- a/src/resolve/absolute.cpp
+++ b/src/resolve/absolute.cpp
@@ -1803,7 +1803,7 @@ void Resolve_Absolute_Pattern(Context& context, bool allow_refutable, ::AST::Pa
}
),
(Macro,
- BUG(pat.span(), "Resolve_Absolute_Pattern - Encountered Macro");
+ BUG(pat.span(), "Resolve_Absolute_Pattern - Encountered Macro - " << pat);
),
(Any,
// Ignore '_'