Skip to content

Commit

Permalink
Fixes Issue 8717 - Private and Protected should be accessible from wi…
Browse files Browse the repository at this point in the history
…thin

same module.
  • Loading branch information
AndrejMitrovic committed Jan 26, 2013
1 parent 2d83684 commit 1a97d36
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/access.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ void AggregateDeclaration::accessCheck(Loc loc, Scope *sc, Dsymbol *smember)
result = access2 >= PROTpublic ||
hasPrivateAccess(f) ||
isFriendOf(cdscope) ||
(access2 == PROTpackage && hasPackageAccess(sc, this));
(access2 == PROTpackage && hasPackageAccess(sc, this)) ||
getAccessModule() == sc->module;
#if LOG
printf("result1 = %d\n", result);
#endif
Expand Down
63 changes: 63 additions & 0 deletions test/compilable/test8717.d
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
module test8717;

struct SPR
{
private:
enum e = 1;
immutable int ii = 1;
immutable static int sii = 1;
static int sf() { return 1; }
int f() const { return 1; }
}

static assert(SPR.e == 1);
static assert(SPR.ii == 1);
static assert(SPR.sii == 1);
static assert(SPR.sf() == 1);
static assert(SPR.init.e == 1);
static assert(SPR.init.ii == 1);
static assert(SPR.init.sii == 1);
static assert(SPR.sf() == 1);
static assert(SPR.init.f() == 1);

static if(SPR.e != 1) { static assert(0); }
static if(SPR.ii != 1) { static assert(0); }
static if(SPR.sii != 1) { static assert(0); }
static if(SPR.sf() != 1) { static assert(0); }
static if(SPR.init.e != 1) { static assert(0); }
static if(SPR.init.ii != 1) { static assert(0); }
static if(SPR.init.sii != 1) { static assert(0); }
static if(SPR.sf() != 1) { static assert(0); }
static if(SPR.init.f() != 1) { static assert(0); }

struct SPT
{
protected:
enum e = 1;
immutable int ii = 1;
immutable static int sii = 1;
static int sf() { return 1; }
int f() const { return 1; }
}

static assert(SPT.e == 1);
static assert(SPT.ii == 1);
static assert(SPT.sii == 1);
static assert(SPT.sf() == 1);
static assert(SPT.init.e == 1);
static assert(SPT.init.ii == 1);
static assert(SPT.init.sii == 1);
static assert(SPT.sf() == 1);
static assert(SPT.init.f() == 1);

static if(SPT.e != 1) { static assert(0); }
static if(SPT.ii != 1) { static assert(0); }
static if(SPT.sii != 1) { static assert(0); }
static if(SPT.sf() != 1) { static assert(0); }
static if(SPT.init.e != 1) { static assert(0); }
static if(SPT.init.ii != 1) { static assert(0); }
static if(SPT.init.sii != 1) { static assert(0); }
static if(SPT.sf() != 1) { static assert(0); }
static if(SPT.init.f() != 1) { static assert(0); }

void main() { }

0 comments on commit 1a97d36

Please sign in to comment.