diff options
Diffstat (limited to 'src/resolve/use.cpp')
| -rw-r--r-- | src/resolve/use.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/resolve/use.cpp b/src/resolve/use.cpp index 5d794b66..9931eefa 100644 --- a/src/resolve/use.cpp +++ b/src/resolve/use.cpp @@ -118,7 +118,6 @@ void Resolve_Use_Mod(const ::AST::Crate& crate, ::AST::Module& mod, ::AST::Path } void visit(AST::ExprNode_Block& node) override { - // TODO: Recurse into module, with a stack of immediate-scope modules for resolution. if( node.m_local_mod ) { Resolve_Use_Mod(this->crate, *node.m_local_mod, node.m_local_mod->path(), this->parent_modules); @@ -131,6 +130,7 @@ void Resolve_Use_Mod(const ::AST::Crate& crate, ::AST::Module& mod, ::AST::Path } } expr_iter(crate, mod); + // TODO: Check that all code blocks are covered by these two for(auto& i : mod.items()) { TU_MATCH_DEF( AST::Item, (i.data), (e), @@ -140,9 +140,34 @@ void Resolve_Use_Mod(const ::AST::Crate& crate, ::AST::Module& mod, ::AST::Path if( e.code().is_valid() ) { e.code().node().visit( expr_iter ); } + ), + (Static, + if( e.value().is_valid() ) { + e.value().node().visit( expr_iter ); + } ) ) } + for(auto& im : mod.impls()) + { + for(auto& i : im.items()) + { + TU_MATCH_DEF( AST::Item, (i.data), (e), + ( + ), + (Function, + if( e.code().is_valid() ) { + e.code().node().visit( expr_iter ); + } + ), + (Static, + if( e.value().is_valid() ) { + e.value().node().visit( expr_iter ); + } + ) + ) + } + } } ::AST::PathBinding Resolve_Use_GetBinding_Mod(const Span& span, const ::AST::Crate& crate, const ::AST::Module& mod, const ::std::string& des_item_name, slice< const ::AST::Module* > parent_modules) |