diff options
Diffstat (limited to 'src/expand/macro_rules.cpp')
| -rw-r--r-- | src/expand/macro_rules.cpp | 86 |
1 files changed, 52 insertions, 34 deletions
diff --git a/src/expand/macro_rules.cpp b/src/expand/macro_rules.cpp index 4f5d33cf..359b9865 100644 --- a/src/expand/macro_rules.cpp +++ b/src/expand/macro_rules.cpp @@ -3,6 +3,7 @@ #include "../ast/expr.hpp" #include "../ast/ast.hpp" #include "../parse/common.hpp" +#include <ast/crate.hpp> #include "macro_rules.hpp" #include <macro_rules/macro_rules.hpp> @@ -33,49 +34,66 @@ class CMacroUseHandler: void handle(const Span& sp, const AST::MetaItem& mi, ::AST::Crate& crate, const AST::Path& path, AST::Module& mod, AST::Item& i) const override { TRACE_FUNCTION_F("path=" << path); - if( !i.is_Module() ) - ERROR(sp, E0000, "Use of #[macro_use] on non-module"); - const auto& submod = i.as_Module(); - - if( mi.has_sub_items() ) - { - for( const auto& si : mi.items() ) + TU_IFLET( ::AST::Item, i, None, e, + // Just ignore + ) + else TU_IFLET( ::AST::Item, i, Crate, ec_name, + const auto& ec = crate.m_extern_crates.at(ec_name.name); + if( mi.has_sub_items() ) { - const auto& name = si.name(); - for( const auto& mr : submod.macros() ) + TODO(sp, "Named import from extern crate"); + } + else + { + ec.with_all_macros([&](const auto& name, const auto& mac) { + mod.add_macro_import( name, mac ); + }); + } + ) + else TU_IFLET( ::AST::Item, i, Module, submod, + if( mi.has_sub_items() ) + { + for( const auto& si : mi.items() ) { - if( mr.name == name ) { - DEBUG("Imported " << mr.name); - mod.add_macro_import( mr.name, *mr.data ); - goto _good; + const auto& name = si.name(); + for( const auto& mr : submod.macros() ) + { + if( mr.name == name ) { + DEBUG("Imported " << mr.name); + mod.add_macro_import( mr.name, *mr.data ); + goto _good; + } } - } - for( const auto& mri : submod.macro_imports_res() ) - { - if( mri.name == name ) { - DEBUG("Imported " << mri.name << " (propagate)"); - mod.add_macro_import( mri.name, *mri.data ); - goto _good; + for( const auto& mri : submod.macro_imports_res() ) + { + if( mri.name == name ) { + DEBUG("Imported " << mri.name << " (propagate)"); + mod.add_macro_import( mri.name, *mri.data ); + goto _good; + } } + ERROR(sp, E0000, "Couldn't find macro " << name); + _good: + (void)0; } - ERROR(sp, E0000, "Couldn't find macro " << name); - _good: - (void)0; } - } - else - { - for( const auto& mr : submod.macros() ) - { - DEBUG("Imported " << mr.name); - mod.add_macro_import( mr.name, *mr.data ); - } - for( const auto& mri : submod.macro_imports_res() ) + else { - DEBUG("Imported " << mri.name << " (propagate)"); - mod.add_macro_import( mri.name, *mri.data ); + for( const auto& mr : submod.macros() ) + { + DEBUG("Imported " << mr.name); + mod.add_macro_import( mr.name, *mr.data ); + } + for( const auto& mri : submod.macro_imports_res() ) + { + DEBUG("Imported " << mri.name << " (propagate)"); + mod.add_macro_import( mri.name, *mri.data ); + } } + ) + else { + ERROR(sp, E0000, "Use of #[macro_use] on non-module/crate - " << i.tag_str()); } } |