comparison dmd2/module.c @ 847:356e65836fb5

Merged DMD 2.021 frontend. Removed generated files from dmd/dmd2 dirs.
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sat, 13 Dec 2008 16:14:37 +0100
parents f04dde6e882c
children 2667e3a145be
comparison
equal deleted inserted replaced
846:bc982f1ad106 847:356e65836fb5
100 versionids = NULL; 100 versionids = NULL;
101 versionidsNot = NULL; 101 versionidsNot = NULL;
102 102
103 macrotable = NULL; 103 macrotable = NULL;
104 escapetable = NULL; 104 escapetable = NULL;
105 safe = FALSE;
105 doppelganger = 0; 106 doppelganger = 0;
106 cov = NULL; 107 cov = NULL;
107 covb = NULL; 108 covb = NULL;
108 109
109 srcfilename = FileName::defaultExt(filename, global.mars_ext); 110 srcfilename = FileName::defaultExt(filename, global.mars_ext);
588 589
589 DsymbolTable *dst; 590 DsymbolTable *dst;
590 591
591 if (md) 592 if (md)
592 { this->ident = md->id; 593 { this->ident = md->id;
594 this->safe = md->safe;
593 dst = Package::resolve(md->packages, &this->parent, NULL); 595 dst = Package::resolve(md->packages, &this->parent, NULL);
594 } 596 }
595 else 597 else
596 { 598 {
597 dst = modules; 599 dst = modules;
888 //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim); 890 //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
889 } 891 }
890 892
891 /* =========================== ModuleDeclaration ===================== */ 893 /* =========================== ModuleDeclaration ===================== */
892 894
893 ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id) 895 ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id, bool safe)
894 { 896 {
895 this->packages = packages; 897 this->packages = packages;
896 this->id = id; 898 this->id = id;
899 this->safe = safe;
897 } 900 }
898 901
899 char *ModuleDeclaration::toChars() 902 char *ModuleDeclaration::toChars()
900 { 903 {
901 OutBuffer buf; 904 OutBuffer buf;