Resolve - Place struct enum variants in the type namespace, fix serialisation bug

4 files changed, 21 insertions, 5 deletions

diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp
index 1acd035b..fffff7fa 100644
--- a/src/hir/deserialise.cpp
+++ b/src/hir/deserialise.cpp
@@ -414,7 +414,7 @@ namespace {
             switch( m_in.read_tag() )
             {
             case 0:
-                return ::HIR::TypeItem({ deserialise_simplepath(), m_in.read_bool(), static_cast<unsigned int>(m_in.read_count()) });
+                return ::HIR::TypeItem::make_Import({ deserialise_simplepath(), m_in.read_bool(), static_cast<unsigned int>(m_in.read_count()) });
             case 1:
                 return ::HIR::TypeItem( deserialise_module() );
             case 2:
@@ -436,7 +436,7 @@ namespace {
             switch( m_in.read_tag() )
             {
             case 0:
-                return ::HIR::ValueItem({ deserialise_simplepath(), m_in.read_bool(), static_cast<unsigned int>(m_in.read_count()) });
+                return ::HIR::ValueItem::make_Import({ deserialise_simplepath(), m_in.read_bool(), static_cast<unsigned int>(m_in.read_count()) });
             case 1:
                 return ::HIR::ValueItem( deserialise_constant() );
             case 2:
diff --git a/src/hir/serialise.cpp b/src/hir/serialise.cpp
index e7b82cae..dd68a792 100644
--- a/src/hir/serialise.cpp
+++ b/src/hir/serialise.cpp
@@ -623,7 +623,7 @@ namespace {
                 m_out.write_tag(0);
                 serialise_simplepath(e.path);
                 m_out.write_bool(e.is_variant);
-                m_out.write_bool(e.idx);
+                m_out.write_count(e.idx);
                 ),
             (Module,
                 m_out.write_tag(1);
@@ -658,7 +658,7 @@ namespace {
                 m_out.write_tag(0);
                 serialise_simplepath(e.path);
                 m_out.write_bool(e.is_variant);
-                m_out.write_bool(e.idx);
+                m_out.write_count(e.idx);
                 ),
             (Constant,
                 m_out.write_tag(1);
diff --git a/src/resolve/index.cpp b/src/resolve/index.cpp
index 71da3b4e..c0276695 100644
--- a/src/resolve/index.cpp
+++ b/src/resolve/index.cpp
@@ -219,7 +219,21 @@ void Resolve_Index_Module_Base(const AST::Crate& crate, AST::Module& mod)
                         ),
                     (Static  , _add_item_value(sp, mod, i.name, i.is_pub,  i_data.path, !allow_collide); ),
                     (Function, _add_item_value(sp, mod, i.name, i.is_pub,  i_data.path, !allow_collide); ),
-                    (EnumVar , _add_item_value(sp, mod, i.name, i.is_pub,  i_data.path, !allow_collide); )
+                    (EnumVar ,
+                        bool is_struct = false;
+                        if( e.enum_ ) {
+                            ASSERT_BUG(sp, e.idx < e.enum_->variants().size(), "Variant out of range for " << i_data.path);
+                            is_struct = e.enum_->variants().at(e.idx).m_data.is_Struct();
+                        }
+                        else {
+                            ASSERT_BUG(sp, e.idx < e.hir->m_variants.size(), "Variant out of range for " << i_data.path);
+                            is_struct = e.hir->m_variants.at(e.idx).second.is_Struct();
+                        }
+                        if( is_struct )
+                            _add_item_type(sp, mod, i.name, i.is_pub,  i_data.path, !allow_collide);
+                        else
+                            _add_item_value(sp, mod, i.name, i.is_pub,  i_data.path, !allow_collide);
+                        )
                     )
                 }
             };
diff --git a/src/resolve/use.cpp b/src/resolve/use.cpp
index b376e21f..0196108f 100644
--- a/src/resolve/use.cpp
+++ b/src/resolve/use.cpp
@@ -575,6 +575,7 @@ namespace {
                     auto p = e.path;
                     p.m_components.pop_back();
                     const auto& enm = ec.m_hir->get_typeitem_by_path(span, p, true).as_Enum();
+                    assert(e.idx < enm.m_variants.size());
                     return ::AST::PathBinding::make_EnumVar({ nullptr, e.idx, &enm });
                 }
                 if( e.path.m_components.empty() )
@@ -619,6 +620,7 @@ namespace {
                     auto p = e.path;
                     p.m_components.pop_back();
                     const auto& enm = ec.m_hir->get_typeitem_by_path(span, p, true).as_Enum();
+                    assert(e.idx < enm.m_variants.size());
                     return ::AST::PathBinding::make_EnumVar({ nullptr, e.idx, &enm });
                 }
                 item_ptr = &ec.m_hir->get_valitem_by_path(span, e.path, true);    // ignore_crate_name=true