Mercurial > projects > ldc

comparison dmd/access.c @ 1630:44b145be2ef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge dmd 1.056.
author Robert Clipsham <robert@octarineparrot.com>
date Sat, 06 Feb 2010 15:53:52 +0000
parents eb7cb41ee585
children
comparison
equal deleted inserted replaced
1629:b07d683ba4d0 1630:44b145be2ef5
390 //printf("accessCheck(%s)\n", d->toChars()); 390 //printf("accessCheck(%s)\n", d->toChars());
391 } 391 }
392 #endif 392 #endif
393 if (!e) 393 if (!e)
394 { 394 {
395 if (d->getModule() != sc->module) 395 if (d->prot() == PROTprivate && d->getModule() != sc->module ||
396 if (d->prot() == PROTprivate || 396 d->prot() == PROTpackage && !hasPackageAccess(sc, d))
397 d->prot() == PROTpackage && !hasPackageAccess(sc, d)) 397
398 398 error(loc, "%s %s.%s is not accessible from %s",
399 error(loc, "%s %s.%s is not accessible from %s", 399 d->kind(), d->getModule()->toChars(), d->toChars(), sc->module->toChars());
400 d->kind(), d->getModule()->toChars(), d->toChars(), sc->module->toChars());
401 } 400 }
402 else if (e->type->ty == Tclass) 401 else if (e->type->ty == Tclass)
403 { // Do access check 402 { // Do access check
404 ClassDeclaration *cd; 403 ClassDeclaration *cd;
405 404