Mercurial > projects > ldc
diff dmd2/template.h @ 1526:54b3c1394d62
Merged dmdfe 2.031.
| author | Robert Clipsham <robert@octarineparrot.com> |
|---|---|
| date | Tue, 07 Jul 2009 02:26:11 +0100 |
| parents | 638d16625da2 |
| children |
line wrap: on
line diff
--- a/dmd2/template.h Mon Jul 06 23:57:27 2009 +0100 +++ b/dmd2/template.h Tue Jul 07 02:26:11 2009 +0100 @@ -61,7 +61,8 @@ TemplateDeclaration *overnext; // next overloaded TemplateDeclaration TemplateDeclaration *overroot; // first in overnext list - Scope *scope; + int semanticRun; // 1 semantic() run + Dsymbol *onemember; // if !=NULL then one member of this template int literal; // this template declaration is a literal @@ -284,7 +285,7 @@ AliasDeclaration *aliasdecl; // !=NULL if instance is an alias for its // sole member WithScopeSymbol *withsym; // if a member of a with statement - int semanticdone; // has semantic() been done? + int semanticRun; // has semantic() been done? int semantictiargsdone; // has semanticTiargs() been done? int nest; // for recursion detection int havetempdecl; // 1 if used second constructor @@ -343,8 +344,6 @@ Array *idents; Type *tqual; - Scope *scope; // for forward referencing - TemplateMixin(Loc loc, Identifier *ident, Type *tqual, Array *idents, Objects *tiargs); Dsymbol *syntaxCopy(Dsymbol *s); void semantic(Scope *sc);