diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-07 21:29:46 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-07 21:29:46 +0000 |
commit | 06ee9a2a1d20ca034dc74eade40fc06b79f1f42f (patch) | |
tree | 35f359d82c120ce4e5fae4a38d261de5e0ae73ed | |
parent | 81c4b26b695db95c656d9b8a0ec5dd453e011648 (diff) | |
download | gcc-06ee9a2a1d20ca034dc74eade40fc06b79f1f42f.tar.gz |
Fix second import of package using _.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170755 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/go/gofrontend/gogo.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc index 52370499f45..69ad3981765 100644 --- a/gcc/go/gofrontend/gogo.cc +++ b/gcc/go/gofrontend/gogo.cc @@ -308,12 +308,7 @@ Gogo::import_package(const std::string& filename, ln = package->name(); is_ln_exported = Lex::is_exported_name(ln); } - if (ln != ".") - { - ln = this->pack_hidden_name(ln, is_ln_exported); - this->package_->bindings()->add_package(ln, package); - } - else + if (ln == ".") { Bindings* bindings = package->bindings(); for (Bindings::const_declarations_iterator p = @@ -322,6 +317,13 @@ Gogo::import_package(const std::string& filename, ++p) 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; } |