comparison dmd/scope.c @ 159:5acec6b2eef8 trunk

[svn r175] merged dmd 1.029
author ChristianK
date Thu, 01 May 2008 15:15:28 +0200
parents 8f704cb9969b
children a58d8f4b84df
comparison
equal deleted inserted replaced
158:287540c5f05e 159:5acec6b2eef8
67 this->offset = 0; 67 this->offset = 0;
68 this->inunion = 0; 68 this->inunion = 0;
69 this->incontract = 0; 69 this->incontract = 0;
70 this->nofree = 0; 70 this->nofree = 0;
71 this->noctor = 0; 71 this->noctor = 0;
72 this->noaccesscheck = 0;
72 this->intypeof = 0; 73 this->intypeof = 0;
73 this->parameterSpecialization = 0; 74 this->parameterSpecialization = 0;
74 this->callSuper = 0; 75 this->callSuper = 0;
75 this->flags = 0; 76 this->flags = 0;
76 this->anonAgg = NULL; 77 this->anonAgg = NULL;
113 this->offset = 0; 114 this->offset = 0;
114 this->inunion = enclosing->inunion; 115 this->inunion = enclosing->inunion;
115 this->incontract = enclosing->incontract; 116 this->incontract = enclosing->incontract;
116 this->nofree = 0; 117 this->nofree = 0;
117 this->noctor = enclosing->noctor; 118 this->noctor = enclosing->noctor;
119 this->noaccesscheck = enclosing->noaccesscheck;
118 this->intypeof = enclosing->intypeof; 120 this->intypeof = enclosing->intypeof;
119 this->parameterSpecialization = enclosing->parameterSpecialization; 121 this->parameterSpecialization = enclosing->parameterSpecialization;
120 this->callSuper = enclosing->callSuper; 122 this->callSuper = enclosing->callSuper;
121 this->flags = 0; 123 this->flags = 0;
122 this->anonAgg = NULL; 124 this->anonAgg = NULL;
295 { Scope *sc; 297 { Scope *sc;
296 298
297 for (sc = this; sc; sc = sc->enclosing) 299 for (sc = this; sc; sc = sc->enclosing)
298 { 300 {
299 ClassDeclaration *cd; 301 ClassDeclaration *cd;
300 302
301 if (sc->scopesym) 303 if (sc->scopesym)
302 { 304 {
303 cd = sc->scopesym->isClassDeclaration(); 305 cd = sc->scopesym->isClassDeclaration();
304 if (cd) 306 if (cd)
305 return cd; 307 return cd;
316 { Scope *sc; 318 { Scope *sc;
317 319
318 for (sc = this; sc; sc = sc->enclosing) 320 for (sc = this; sc; sc = sc->enclosing)
319 { 321 {
320 AggregateDeclaration *ad; 322 AggregateDeclaration *ad;
321 323
322 if (sc->scopesym) 324 if (sc->scopesym)
323 { 325 {
324 ad = sc->scopesym->isClassDeclaration(); 326 ad = sc->scopesym->isClassDeclaration();
325 if (ad) 327 if (ad)
326 return ad; 328 return ad;