summaryrefslogtreecommitdiff
path: root/src/resolve/use.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-10-16 10:31:00 +0800
committerJohn Hodge <tpg@mutabah.net>2016-10-16 10:31:00 +0800
commitf353d572ea66b9bfcfdc9a4e50548838a9e8c7c3 (patch)
tree7eb8b34804e85f8e0b2fe3eba9e71da9b141803d /src/resolve/use.cpp
parentc2cec3e30a0f142bc2e44d756463558ab8d2f1e1 (diff)
downloadmrust-f353d572ea66b9bfcfdc9a4e50548838a9e8c7c3.tar.gz
Resolve - Handle glob imports from external enums
Diffstat (limited to 'src/resolve/use.cpp')
-rw-r--r--src/resolve/use.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resolve/use.cpp b/src/resolve/use.cpp
index e717f617..7d372fc3 100644
--- a/src/resolve/use.cpp
+++ b/src/resolve/use.cpp
@@ -96,6 +96,7 @@ void Resolve_Use_Mod(const ::AST::Crate& crate, ::AST::Module& mod, ::AST::Path
// TODO: Have Resolve_Use_GetBinding return the actual path
use_stmt_data.path.bind( Resolve_Use_GetBinding(span, crate, use_stmt_data.path, parent_modules) );
+ DEBUG("'" << use_stmt.name << "' = " << use_stmt_data.path);
// - If doing a glob, ensure the item type is valid
if( use_stmt.name == "" )
@@ -139,6 +140,7 @@ void Resolve_Use_Mod(const ::AST::Crate& crate, ::AST::Module& mod, ::AST::Path
}
ASSERT_BUG(span, allow != Lookup::Any, "");
use_stmt_data.alt_binding = Resolve_Use_GetBinding(span, crate, use_stmt_data.path, parent_modules, allow);
+ DEBUG("- Alt Binding: " << use_stmt_data.alt_binding);
}
}
@@ -491,7 +493,7 @@ namespace {
if( it2 == e.m_variants.end() ) {
ERROR(span, E0000, "Unable to find variant " << path);
}
- return ::AST::PathBinding::make_EnumVar({ nullptr, static_cast<unsigned int>(it2 - e.m_variants.begin()) });
+ return ::AST::PathBinding::make_EnumVar({ nullptr, static_cast<unsigned int>(it2 - e.m_variants.begin()), &e });
)
)
}
@@ -517,7 +519,7 @@ namespace {
return ::AST::PathBinding::make_TypeAlias({nullptr});
),
(Enum,
- return ::AST::PathBinding::make_Enum({nullptr});
+ return ::AST::PathBinding::make_Enum({nullptr, &e});
),
(Struct,
return ::AST::PathBinding::make_Struct({nullptr, &e});