HIR - Save/load macro source crate

3 files changed, 9 insertions, 5 deletions

diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp
index 9fc7d23c..be8cccc9 100644
--- a/src/hir/deserialise.cpp
+++ b/src/hir/deserialise.cpp
@@ -288,6 +288,9 @@ namespace {
             ::MacroRules    rv;
             rv.m_exported = true;
             rv.m_rules = deserialise_vec_c< ::MacroRulesArm>( [&](){ return deserialise_macrorulesarm(); });
+            rv.m_source_crate = read_string();
+            if(rv.m_source_crate == "")
+                rv.m_source_crate = m_crate_name;
             return rv;
         }
         ::MacroPatEnt deserialise_macropatent() {
diff --git a/src/hir/from_ast.cpp b/src/hir/from_ast.cpp
index 275e5845..c62cc6b9 100644
--- a/src/hir/from_ast.cpp
+++ b/src/hir/from_ast.cpp
@@ -1304,16 +1304,16 @@ public:
     auto& macros = rv.m_exported_macros;
     
     // - Extract macros from root module
-    for( /*const*/ auto& mac : crate.m_root_module.macros() ) {
-        //if( mac.data.export ) {
-        macros.insert( ::std::make_pair( mac.name, mv$(mac.data) ) );
-        //}
-    }
     for( auto& mac : crate.m_root_module.macro_imports_res() ) {
         //if( mac.data->export ) {
         macros.insert( ::std::make_pair( mac.name, MacroRulesPtr(new MacroRules( mv$(*const_cast<MacroRules*>(mac.data)) )) ) );
         //}
     }
+    for( /*const*/ auto& mac : crate.m_root_module.macros() ) {
+        //if( mac.data.export ) {
+        macros.insert( ::std::make_pair( mac.name, mv$(mac.data) ) );
+        //}
+    }
     
     auto sp = Span();
     // - Store the lang item paths so conversion code can use them.
diff --git a/src/hir/serialise.cpp b/src/hir/serialise.cpp
index 7c112b23..238b90d0 100644
--- a/src/hir/serialise.cpp
+++ b/src/hir/serialise.cpp
@@ -407,6 +407,7 @@ namespace {
         {
             //m_exported: IGNORE, should be set
             serialise_vec(mac.m_rules);
+            write_string(mac.m_source_crate);
         }
         void serialise(const ::MacroPatEnt& pe) {
             write_string(pe.name);