diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-05-28 13:45:16 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-05-28 13:45:16 +0800 |
| commit | 6747de8643ffd4a0a1705ac4c00c8cfb9a957154 (patch) | |
| tree | 70b463241e2dcccd247afddf1fc1135c4f547127 /src/resolve/index.cpp | |
| parent | 99350d82f33acbbd3968dd0e45cfcfa415373b19 (diff) | |
| download | mrust-6747de8643ffd4a0a1705ac4c00c8cfb9a957154.tar.gz | |
AST - Refactor to make unit-like structs their own variant
Diffstat (limited to 'src/resolve/index.cpp')
| -rw-r--r-- | src/resolve/index.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/resolve/index.cpp b/src/resolve/index.cpp index 7b988bc0..f57fc3e6 100644 --- a/src/resolve/index.cpp +++ b/src/resolve/index.cpp @@ -149,7 +149,7 @@ void Resolve_Index_Module_Base(const AST::Crate& crate, AST::Module& mod) (Struct, p.bind( ::AST::PathBinding::make_Struct({&e}) ); // - If the struct is a tuple-like struct (or unit-like), it presents in the value namespace - if( e.m_data.is_Tuple() ) { + if( ! e.m_data.is_Struct() ) { _add_item_value(i.data.span, mod, i.name, i.is_pub, p); } _add_item_type(i.data.span, mod, i.name, i.is_pub, mv$(p)); @@ -209,15 +209,9 @@ void Resolve_Index_Module_Base(const AST::Crate& crate, AST::Module& mod) _add_item_type(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide); // - If the struct is a tuple-like struct, it presents in the value namespace assert(e.struct_ || e.hir); - if( e.struct_ ) { - if( e.struct_->m_data.is_Tuple() ) { - _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide); - } - } - else { - if( ! e.hir->m_data.is_Named() ) { - _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide); - } + if( !(e.struct_ ? e.struct_->m_data.is_Struct() : e.hir->m_data.is_Named()) ) + { + _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide); } ), (Static , _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide); ), |