D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-07-30 11:00:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix import visibility bugs 313 and 314.

Browse Source
This commit is contained in:
Christian Kamm
2008-10-01 19:16:10 +02:00
parent cd99e773f0
commit 271012bcfc
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dmd/import.c
View File

@@ -33,6 +33,7 @@ Import::Import(Loc loc, Array *packages, Identifier *id, Identifier *aliasId,
this->id = id;
this->aliasId = aliasId;
this->isstatic = isstatic;
protection = PROTundefined;
pkg = NULL;
mod = NULL;
@@ -60,6 +61,10 @@ const char *Import::kind()
return isstatic ? (char *)"static import" : (char *)"import";
}
enum PROT Import::prot()
{
return protection;
}
Dsymbol *Import::syntaxCopy(Dsymbol *s)
{
@@ -131,14 +136,15 @@ void Import::semantic(Scope *sc)
}
#endif
/* Default to private importing
*/
protection = sc->protection;
if (!sc->explicitProtection)
protection = PROTprivate;
if (!isstatic && !aliasId && !names.dim)
{
/* Default to private importing
*/
enum PROT prot = sc->protection;
if (!sc->explicitProtection)
prot = PROTprivate;
sc->scopesym->importScope(mod, prot);
sc->scopesym->importScope(mod, protection);
}
// Modules need a list of each imported module
@@ -149,13 +155,14 @@ void Import::semantic(Scope *sc)
sc = sc->push(mod);
for (size_t i = 0; i < aliasdecls.dim; i++)
{ Dsymbol *s = (Dsymbol *)aliasdecls.data[i];
{ AliasDeclaration *ad = (AliasDeclaration *)aliasdecls.data[i];
//printf("\tImport alias semantic('%s')\n", s->toChars());
if (!mod->search(loc, (Identifier *)names.data[i], 0))
error("%s not found", ((Identifier *)names.data[i])->toChars());
s->semantic(sc);
ad->semantic(sc);
ad->protection = protection;
}
sc = sc->pop();
}