comparison dmd/EnumDeclaration.d @ 179:cd48cb899aee

Updated to dmd2.040
author korDen
date Sun, 17 Oct 2010 20:56:07 +0400
parents e3afd1303184
children b0d41ff5e0df
comparison
equal deleted inserted replaced
178:e3afd1303184 179:cd48cb899aee
116 if (scope_) 116 if (scope_)
117 { sc = scope_; 117 { sc = scope_;
118 scx = scope_; // save so we don't make redundant copies 118 scx = scope_; // save so we don't make redundant copies
119 scope_ = null; 119 scope_ = null;
120 } 120 }
121
122 uint dprogress_save = global.dprogress;
121 123
122 if (sc.stc & STC.STCdeprecated) 124 if (sc.stc & STC.STCdeprecated)
123 isdeprecated = true; 125 isdeprecated = true;
124 126
125 parent = sc.parent; 127 parent = sc.parent;
143 { 145 {
144 // memtype is forward referenced, so try again later 146 // memtype is forward referenced, so try again later
145 scope_ = scx ? scx : sc.clone(); 147 scope_ = scx ? scx : sc.clone();
146 scope_.setNoFree(); 148 scope_.setNoFree();
147 scope_.module_.addDeferredSemantic(this); 149 scope_.module_.addDeferredSemantic(this);
148 writef("\tdeferring %s\n", toChars()); 150 global.dprogress = dprogress_save;
151 //writef("\tdeferring %s\n", toChars());
149 return; 152 return;
150 } 153 }
151 } 154 }
152 static if (false) 155 static if (false)
153 { 156 {
158 } 161 }
159 } 162 }
160 } 163 }
161 164
162 isdone = true; 165 isdone = true;
166 global.dprogress++;
163 167
164 type = type.semantic(loc, sc); 168 type = type.semantic(loc, sc);
165 if (isAnonymous()) 169 if (isAnonymous())
166 sce = sc; 170 sce = sc;
167 else 171 else