Mercurial > projects > ldc

comparison dmd/scope.c @ 1587:def7a1d494fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge DMD 1.051
author Christian Kamm <kamm incasoftware de>
date Fri, 06 Nov 2009 23:58:01 +0100
parents f99a3b393c03
children 9bf06e02070b
comparison
equal deleted inserted replaced
1586:7f728c52e63c 1587:def7a1d494fd
69 this->inunion = 0; 69 this->inunion = 0;
70 this->incontract = 0; 70 this->incontract = 0;
71 this->nofree = 0; 71 this->nofree = 0;
72 this->noctor = 0; 72 this->noctor = 0;
73 this->noaccesscheck = 0; 73 this->noaccesscheck = 0;
74 this->mustsemantic = 0;
74 this->intypeof = 0; 75 this->intypeof = 0;
75 this->parameterSpecialization = 0; 76 this->parameterSpecialization = 0;
76 this->callSuper = 0; 77 this->callSuper = 0;
77 this->flags = 0; 78 this->flags = 0;
78 this->anonAgg = NULL; 79 this->anonAgg = NULL;
117 this->inunion = enclosing->inunion; 118 this->inunion = enclosing->inunion;
118 this->incontract = enclosing->incontract; 119 this->incontract = enclosing->incontract;
119 this->nofree = 0; 120 this->nofree = 0;
120 this->noctor = enclosing->noctor; 121 this->noctor = enclosing->noctor;
121 this->noaccesscheck = enclosing->noaccesscheck; 122 this->noaccesscheck = enclosing->noaccesscheck;
123 this->mustsemantic = enclosing->mustsemantic;
122 this->intypeof = enclosing->intypeof; 124 this->intypeof = enclosing->intypeof;
123 this->parameterSpecialization = enclosing->parameterSpecialization; 125 this->parameterSpecialization = enclosing->parameterSpecialization;
124 this->callSuper = enclosing->callSuper; 126 this->callSuper = enclosing->callSuper;
125 this->flags = 0; 127 this->flags = 0;
126 this->anonAgg = NULL; 128 this->anonAgg = NULL;
280 if (sc->scopesym) 282 if (sc->scopesym)
281 { 283 {
282 //printf("\t\tsc->scopesym = %p\n", sc->scopesym); 284 //printf("\t\tsc->scopesym = %p\n", sc->scopesym);
283 if (!sc->scopesym->symtab) 285 if (!sc->scopesym->symtab)
284 sc->scopesym->symtab = new DsymbolTable(); 286 sc->scopesym->symtab = new DsymbolTable();
285 return sc->scopesym->symtab->insert(s); 287 return sc->scopesym->symtabInsert(s);
286 } 288 }
287 } 289 }
288 assert(0); 290 assert(0);
289 return NULL; 291 return NULL;
290 } 292 }