projects/ldc: dmd2/access.c annotate

annotate dmd2/access.c @ 1351:8d501abecd24

Initial (but disabled) fix for ticket #294 , the actual part that fixes the bug is in a #if 0 block as I'm afraid it will cause regressions. I'm most likely not going to be around tonight, and maybe not tomorrow as well, so I'm pushing it in case someone wants to run some serious testing/investigate the problem noted in llvmhelpers.cpp : realignOffset .

author	Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date	Thu, 14 May 2009 17:20:17 +0200
parents	f04dde6e882c
children	638d16625da2

rev	line source
758 f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	1
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	2 // Copyright (c) 1999-2006 by Digital Mars
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	3 // All Rights Reserved
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	4 // written by Walter Bright
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	5 // http://www.digitalmars.com
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	6 // License for redistribution is by either the Artistic License
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	7 // in artistic.txt, or the GNU General Public License in gnu.txt.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	8 // See the included readme.txt for details.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	9
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	10
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	11 #include <stdio.h>
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	12 #include <stdlib.h>
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	13 #include <assert.h>
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	14
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	15 #include "root.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	16 #include "mem.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	17
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	18 #include "enum.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	19 #include "aggregate.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	20 #include "init.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	21 #include "attrib.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	22 #include "scope.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	23 #include "id.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	24 #include "mtype.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	25 #include "declaration.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	26 #include "aggregate.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	27 #include "expression.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	28 #include "module.h"
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	29
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	30 #define LOG 0
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	31
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	32 /* Code to do access checks
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	33 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	34
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	35 int hasPackageAccess(Scope sc, Dsymbol s);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	36
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	37 /****************************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	38 * Return PROT access for Dsymbol smember in this declaration.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	39 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	40
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	41 enum PROT AggregateDeclaration::getAccess(Dsymbol *smember)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	42 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	43 return PROTpublic;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	44 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	45
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	46 enum PROT StructDeclaration::getAccess(Dsymbol *smember)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	47 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	48 enum PROT access_ret = PROTnone;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	49
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	50 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	51 printf("+StructDeclaration::getAccess(this = '%s', smember = '%s')\n",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	52 toChars(), smember->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	53 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	54 if (smember->toParent() == this)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	55 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	56 access_ret = smember->prot();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	57 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	58 else if (smember->isDeclaration()->isStatic())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	59 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	60 access_ret = smember->prot();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	61 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	62 return access_ret;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	63 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	64
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	65 enum PROT ClassDeclaration::getAccess(Dsymbol *smember)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	66 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	67 enum PROT access_ret = PROTnone;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	68
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	69 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	70 printf("+ClassDeclaration::getAccess(this = '%s', smember = '%s')\n",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	71 toChars(), smember->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	72 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	73 if (smember->toParent() == this)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	74 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	75 access_ret = smember->prot();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	76 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	77 else
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	78 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	79 enum PROT access;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	80 int i;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	81
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	82 if (smember->isDeclaration()->isStatic())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	83 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	84 access_ret = smember->prot();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	85 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	86
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	87 for (i = 0; i < baseclasses.dim; i++)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	88 { BaseClass b = (BaseClass )baseclasses.data[i];
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	89
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	90 access = b->base->getAccess(smember);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	91 switch (access)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	92 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	93 case PROTnone:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	94 break;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	95
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	96 case PROTprivate:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	97 access = PROTnone; // private members of base class not accessible
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	98 break;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	99
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	100 case PROTpackage:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	101 case PROTprotected:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	102 case PROTpublic:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	103 case PROTexport:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	104 // If access is to be tightened
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	105 if (b->protection < access)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	106 access = b->protection;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	107
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	108 // Pick path with loosest access
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	109 if (access > access_ret)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	110 access_ret = access;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	111 break;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	112
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	113 default:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	114 assert(0);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	115 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	116 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	117 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	118 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	119 printf("-ClassDeclaration::getAccess(this = '%s', smember = '%s') = %d\n",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	120 toChars(), smember->toChars(), access_ret);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	121 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	122 return access_ret;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	123 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	124
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	125 /********************************************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	126 * Helper function for ClassDeclaration::accessCheck()
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	127 * Returns:
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	128 * 0 no access
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	129 * 1 access
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	130 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	131
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	132 static int accessCheckX(
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	133 Dsymbol *smember,
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	134 Dsymbol *sfunc,
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	135 AggregateDeclaration *dthis,
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	136 AggregateDeclaration *cdscope)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	137 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	138 assert(dthis);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	139
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	140 #if 0
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	141 printf("accessCheckX for %s.%s in function %s() in scope %s\n",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	142 dthis->toChars(), smember->toChars(),
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	143 sfunc ? sfunc->toChars() : "NULL",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	144 cdscope ? cdscope->toChars() : "NULL");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	145 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	146 if (dthis->hasPrivateAccess(sfunc) \|\|
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	147 dthis->isFriendOf(cdscope))
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	148 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	149 if (smember->toParent() == dthis)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	150 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	151 else
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	152 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	153 ClassDeclaration *cdthis = dthis->isClassDeclaration();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	154 if (cdthis)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	155 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	156 for (int i = 0; i < cdthis->baseclasses.dim; i++)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	157 { BaseClass b = (BaseClass )cdthis->baseclasses.data[i];
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	158 enum PROT access;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	159
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	160 access = b->base->getAccess(smember);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	161 if (access >= PROTprotected \|\|
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	162 accessCheckX(smember, sfunc, b->base, cdscope)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	163 )
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	164 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	165
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	166 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	167 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	168 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	169 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	170 else
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	171 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	172 if (smember->toParent() != dthis)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	173 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	174 ClassDeclaration *cdthis = dthis->isClassDeclaration();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	175 if (cdthis)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	176 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	177 for (int i = 0; i < cdthis->baseclasses.dim; i++)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	178 { BaseClass b = (BaseClass )cdthis->baseclasses.data[i];
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	179
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	180 if (accessCheckX(smember, sfunc, b->base, cdscope))
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	181 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	182 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	183 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	184 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	185 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	186 return 0;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	187 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	188
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	189 /*******************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	190 * Do access check for member of this class, this class being the
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	191 * type of the 'this' pointer used to access smember.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	192 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	193
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	194 void AggregateDeclaration::accessCheck(Loc loc, Scope sc, Dsymbol smember)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	195 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	196 int result;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	197
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	198 FuncDeclaration *f = sc->func;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	199 AggregateDeclaration *cdscope = sc->getStructClassScope();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	200 enum PROT access;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	201
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	202 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	203 printf("AggregateDeclaration::accessCheck() for %s.%s in function %s() in scope %s\n",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	204 toChars(), smember->toChars(),
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	205 f ? f->toChars() : NULL,
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	206 cdscope ? cdscope->toChars() : NULL);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	207 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	208
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	209 Dsymbol *smemberparent = smember->toParent();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	210 if (!smemberparent \|\| !smemberparent->isAggregateDeclaration())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	211 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	212 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	213 printf("not an aggregate member\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	214 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	215 return; // then it is accessible
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	216 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	217
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	218 // BUG: should enable this check
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	219 //assert(smember->parent->isBaseOf(this, NULL));
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	220
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	221 if (smemberparent == this)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	222 { enum PROT access = smember->prot();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	223
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	224 result = access >= PROTpublic \|\|
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	225 hasPrivateAccess(f) \|\|
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	226 isFriendOf(cdscope) \|\|
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	227 (access == PROTpackage && hasPackageAccess(sc, this));
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	228 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	229 printf("result1 = %d\n", result);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	230 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	231 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	232 else if ((access = this->getAccess(smember)) >= PROTpublic)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	233 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	234 result = 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	235 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	236 printf("result2 = %d\n", result);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	237 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	238 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	239 else if (access == PROTpackage && hasPackageAccess(sc, this))
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	240 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	241 result = 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	242 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	243 printf("result3 = %d\n", result);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	244 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	245 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	246 else
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	247 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	248 result = accessCheckX(smember, f, this, cdscope);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	249 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	250 printf("result4 = %d\n", result);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	251 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	252 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	253 if (!result)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	254 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	255 error(loc, "member %s is not accessible", smember->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	256 halt();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	257 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	258 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	259
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	260 /****************************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	261 * Determine if this is the same or friend of cd.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	262 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	263
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	264 int AggregateDeclaration::isFriendOf(AggregateDeclaration *cd)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	265 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	266 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	267 printf("AggregateDeclaration::isFriendOf(this = '%s', cd = '%s')\n", toChars(), cd ? cd->toChars() : "null");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	268 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	269 if (this == cd)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	270 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	271
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	272 // Friends if both are in the same module
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	273 //if (toParent() == cd->toParent())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	274 if (cd && getModule() == cd->getModule())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	275 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	276 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	277 printf("\tin same module\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	278 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	279 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	280 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	281
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	282 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	283 printf("\tnot friend\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	284 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	285 return 0;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	286 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	287
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	288 /****************************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	289 * Determine if scope sc has package level access to s.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	290 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	291
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	292 int hasPackageAccess(Scope sc, Dsymbol s)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	293 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	294 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	295 printf("hasPackageAccess(s = '%s', sc = '%p')\n", s->toChars(), sc);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	296 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	297
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	298 for (; s; s = s->parent)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	299 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	300 if (s->isPackage() && !s->isModule())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	301 break;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	302 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	303 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	304 if (s)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	305 printf("\tthis is in package '%s'\n", s->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	306 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	307
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	308 if (s && s == sc->module->parent)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	309 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	310 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	311 printf("\ts is in same package as sc\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	312 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	313 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	314 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	315
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	316
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	317 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	318 printf("\tno package access\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	319 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	320 return 0;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	321 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	322
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	323 /**********************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	324 * Determine if smember has access to private members of this declaration.
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	325 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	326
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	327 int AggregateDeclaration::hasPrivateAccess(Dsymbol *smember)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	328 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	329 if (smember)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	330 { AggregateDeclaration *cd = NULL;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	331 Dsymbol *smemberparent = smember->toParent();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	332 if (smemberparent)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	333 cd = smemberparent->isAggregateDeclaration();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	334
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	335 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	336 printf("AggregateDeclaration::hasPrivateAccess(class %s, member %s)\n",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	337 toChars(), smember->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	338 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	339
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	340 if (this == cd) // smember is a member of this class
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	341 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	342 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	343 printf("\tyes 1\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	344 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	345 return 1; // so we get private access
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	346 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	347
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	348 // If both are members of the same module, grant access
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	349 while (1)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	350 { Dsymbol *sp = smember->toParent();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	351 if (sp->isFuncDeclaration() && smember->isFuncDeclaration())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	352 smember = sp;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	353 else
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	354 break;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	355 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	356 if (!cd && toParent() == smember->toParent())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	357 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	358 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	359 printf("\tyes 2\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	360 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	361 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	362 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	363 if (!cd && getModule() == smember->getModule())
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	364 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	365 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	366 printf("\tyes 3\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	367 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	368 return 1;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	369 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	370 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	371 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	372 printf("\tno\n");
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	373 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	374 return 0;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	375 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	376
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	377 /****************************************
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	378 * Check access to d for expression e.d
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	379 */
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	380
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	381 void accessCheck(Loc loc, Scope sc, Expression e, Declaration *d)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	382 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	383 #if LOG
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	384 if (e)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	385 { printf("accessCheck(%s . %s)\n", e->toChars(), d->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	386 printf("\te->type = %s\n", e->type->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	387 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	388 else
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	389 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	390 //printf("accessCheck(%s)\n", d->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	391 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	392 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	393 if (!e)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	394 {
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	395 if (d->prot() == PROTprivate && d->getModule() != sc->module \|\|
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	396 d->prot() == PROTpackage && !hasPackageAccess(sc, d))
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	397
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	398 error(loc, "%s %s.%s is not accessible from %s",
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	399 d->kind(), d->getModule()->toChars(), d->toChars(), sc->module->toChars());
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	400 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	401 else if (e->type->ty == Tclass)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	402 { // Do access check
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	403 ClassDeclaration *cd;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	404
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	405 cd = (ClassDeclaration )(((TypeClass )e->type)->sym);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	406 #if 1
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	407 if (e->op == TOKsuper)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	408 { ClassDeclaration *cd2;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	409
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	410 cd2 = sc->func->toParent()->isClassDeclaration();
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	411 if (cd2)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	412 cd = cd2;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	413 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	414 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	415 cd->accessCheck(loc, sc, d);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	416 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	417 else if (e->type->ty == Tstruct)
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	418 { // Do access check
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	419 StructDeclaration *cd;
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	420
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	421 cd = (StructDeclaration )(((TypeStruct )e->type)->sym);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	422 cd->accessCheck(loc, sc, d);
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	423 }
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	424 }

Mercurial > projects > ldc

annotate dmd2/access.c @ 1351:8d501abecd24