diff options
| author | John Hodge <tpg@mutabah.net> | 2016-09-11 16:14:16 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2016-09-11 16:14:16 +0800 |
| commit | 09b562021cd873625fd25b98b508e853ba47d879 (patch) | |
| tree | 5f8c666a076afaa4e1d8dae3c93bdfc5b2aba483 /src/hir/hir.cpp | |
| parent | c06a0d7011130ffd63f81c604107db4e82323a5c (diff) | |
| download | mrust-09b562021cd873625fd25b98b508e853ba47d879.tar.gz | |
Resolve/Use - HIR imports and searching wildcard imports
Diffstat (limited to 'src/hir/hir.cpp')
| -rw-r--r-- | src/hir/hir.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hir/hir.cpp b/src/hir/hir.cpp index 65a87d7a..636ff7a0 100644 --- a/src/hir/hir.cpp +++ b/src/hir/hir.cpp @@ -373,12 +373,12 @@ const ::HIR::SimplePath& ::HIR::Crate::get_lang_item_path(const Span& sp, const return it->second; } -const ::HIR::TypeItem& ::HIR::Crate::get_typeitem_by_path(const Span& sp, const ::HIR::SimplePath& path) const +const ::HIR::TypeItem& ::HIR::Crate::get_typeitem_by_path(const Span& sp, const ::HIR::SimplePath& path, bool ignore_crate_name) const { ASSERT_BUG(sp, path.m_components.size() > 0, "get_typeitem_by_path received invalid path - " << path); const ::HIR::Module* mod; - if( path.m_crate_name != "" ) { + if( !ignore_crate_name && path.m_crate_name != "" ) { ASSERT_BUG(sp, m_ext_crates.count(path.m_crate_name) > 0, "Crate '" << path.m_crate_name << "' not loaded"); mod = &m_ext_crates.at(path.m_crate_name)->m_root_module; } @@ -448,13 +448,13 @@ const ::HIR::Enum& ::HIR::Crate::get_enum_by_path(const Span& sp, const ::HIR::S } } -const ::HIR::ValueItem& ::HIR::Crate::get_valitem_by_path(const Span& sp, const ::HIR::SimplePath& path) const +const ::HIR::ValueItem& ::HIR::Crate::get_valitem_by_path(const Span& sp, const ::HIR::SimplePath& path, bool ignore_crate_name) const { if( path.m_components.size() == 0) { BUG(sp, "get_valitem_by_path received invalid path"); } const ::HIR::Module* mod; - if( path.m_crate_name != "" ) { + if( !ignore_crate_name && path.m_crate_name != "" ) { ASSERT_BUG(sp, m_ext_crates.count(path.m_crate_name) > 0, "Crate '" << path.m_crate_name << "' not loaded"); mod = &m_ext_crates.at(path.m_crate_name)->m_root_module; } |