From 3ac89867ceb4474c3be9794348d7bd5183305cfb Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sat, 2 Apr 2016 12:32:36 +0800
Subject: Expand - Handle attributes on module-level macro invocations

---
 src/ast/macro.hpp      |  5 ++++-
 src/expand/mod.cpp     | 10 ++++++++--
 src/include/synext.hpp | 17 +++++++++--------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/ast/macro.hpp b/src/ast/macro.hpp
index 733023ca..85f2dea2 100644
--- a/src/ast/macro.hpp
+++ b/src/ast/macro.hpp
@@ -56,7 +56,10 @@ public:
     SERIALISABLE_PROTOTYPES();
     
     friend ::std::ostream& operator<<(::std::ostream& os, const MacroInvocation& x) {
-        os << x.m_attrs << x.m_macro_name << "! " << x.m_ident << x.m_input;
+        os << x.m_attrs;
+        if(x.m_attrs.m_items.size() > 0)
+            os << " ";
+        os << x.m_macro_name << "! " << x.m_ident << x.m_input;
         return os;
     }
 };
diff --git a/src/expand/mod.cpp b/src/expand/mod.cpp
index cfbfc2e7..416db81e 100644
--- a/src/expand/mod.cpp
+++ b/src/expand/mod.cpp
@@ -25,6 +25,12 @@ void Register_Synext_Macro(::std::string name, ::std::unique_ptr<ExpandProcMacro
     g_macros[name] = mv$(handler);
 }
 
+
+void ExpandDecorator::unexpected(const AST::MetaItem& mi, const char* loc_str) const
+{
+    ERROR(Span(), E0000, "Unexpected attribute " << mi.name() << " on " << loc_str);
+}
+
 namespace {
     AttrStage stage_pre(bool is_early) {
         return (is_early ? AttrStage::EarlyPre : AttrStage::LatePre);
@@ -459,14 +465,14 @@ void Expand_Mod(bool is_early, ::AST::Crate& crate, LList<const AST::Module*> mo
     for(unsigned int i = 0; i < mod.macro_invs().size(); i ++ )
     {
         auto& mi = mod.macro_invs()[i];
-        DEBUG("> Macro invoke '"<<mi.name()<<"'");
+        DEBUG("> Macro invoke " << mi);
         
         if( mi.name() != "" )
         {
             // Move out of the module to avoid invalidation if a new macro invocation is added
             auto mi_owned = mv$(mi);
             
-            auto& attrs = mi.attrs();
+            auto& attrs = mi_owned.attrs();
             Expand_Attrs(attrs, stage_pre(is_early),  [&](const auto& d, const auto& a){ d.handle(a, crate, mi_owned); });
             
             auto ttl = Expand_Macro(is_early, crate, modstack, mod, mi_owned);
diff --git a/src/include/synext.hpp b/src/include/synext.hpp
index 0b9ec3f1..4320fceb 100644
--- a/src/include/synext.hpp
+++ b/src/include/synext.hpp
@@ -44,22 +44,23 @@ enum class AttrStage
 
 class ExpandDecorator
 {
+    void unexpected(const AST::MetaItem& mi, const char* loc_str) const;
 public:
     virtual AttrStage   stage() const = 0;
     
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate) const {}
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, AST::MacroInvocation& mac) const {}
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, const AST::Path& path, AST::Module& mod, AST::Item&i) const {}
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate) const { unexpected(mi, "crate"); }
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, AST::MacroInvocation& mac) const { unexpected(mi, "macro invocation"); }
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, const AST::Path& path, AST::Module& mod, AST::Item&i) const { unexpected(mi, "item"); }
     // NOTE: To delete, clear the name
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::StructItem& si) const {}
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::StructItem& si) const { unexpected(mi, "struct item"); }
     // NOTE: To delete, make the type invalid
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::TupleItem& si) const {}
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::TupleItem& si) const { unexpected(mi, "tuple item"); }
     // NOTE: To delete, clear the name
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::EnumVariant& ev) const {}
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::EnumVariant& ev) const { unexpected(mi, "enum variant"); }
     
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::std::unique_ptr<AST::ExprNode>& expr) const {}
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::std::unique_ptr<AST::ExprNode>& expr) const { unexpected(mi, "expression"); }
     // NOTE: To delete, clear the patterns vector
-    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::ExprNode_Match_Arm& expr) const {}
+    virtual void    handle(const AST::MetaItem& mi, AST::Crate& crate, ::AST::ExprNode_Match_Arm& expr) const { unexpected(mi, "match arm"); }
 };
 
 class ExpandProcMacro
-- 
cgit v1.2.3