Commit b4ed5986 by Ian Lance Taylor

Fix second import of package using _.

From-SVN: r170755
parent 6481a43b
...@@ -308,12 +308,7 @@ Gogo::import_package(const std::string& filename, ...@@ -308,12 +308,7 @@ Gogo::import_package(const std::string& filename,
ln = package->name(); ln = package->name();
is_ln_exported = Lex::is_exported_name(ln); is_ln_exported = Lex::is_exported_name(ln);
} }
if (ln != ".") if (ln == ".")
{
ln = this->pack_hidden_name(ln, is_ln_exported);
this->package_->bindings()->add_package(ln, package);
}
else
{ {
Bindings* bindings = package->bindings(); Bindings* bindings = package->bindings();
for (Bindings::const_declarations_iterator p = for (Bindings::const_declarations_iterator p =
...@@ -322,6 +317,13 @@ Gogo::import_package(const std::string& filename, ...@@ -322,6 +317,13 @@ Gogo::import_package(const std::string& filename,
++p) ++p)
this->add_named_object(p->second); this->add_named_object(p->second);
} }
else if (ln == "_")
package->set_uses_sink_alias();
else
{
ln = this->pack_hidden_name(ln, is_ln_exported);
this->package_->bindings()->add_package(ln, package);
}
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment