Mercurial > projects > ldc
diff dmd/attrib.h @ 1602:a413ae7329bf
Merge DMD r243: some harmonization with D2 dmd
---
dmd/aggregate.h | 24 ++++-
dmd/attrib.c | 63 ++++++----
dmd/attrib.h | 10 +-
dmd/declaration.h | 5 +-
dmd/func.c | 337 ++++++++++++++++++++++-------------------------------
dmd/mars.c | 2 +-
dmd/mars.h | 7 +
dmd/mtype.h | 13 ++-
dmd/parse.c | 32 ++++-
dmd/parse.h | 14 ++-
dmd/scope.h | 2 +-
11 files changed, 263 insertions(+), 246 deletions(-)
author | Leandro Lucarella <llucax@gmail.com> |
---|---|
date | Wed, 06 Jan 2010 15:18:19 -0300 |
parents | def7a1d494fd |
children |
line wrap: on
line diff
--- a/dmd/attrib.h Mon Dec 28 02:23:54 2009 +0000 +++ b/dmd/attrib.h Wed Jan 06 15:18:19 2010 -0300 @@ -37,10 +37,10 @@ virtual Array *include(Scope *sc, ScopeDsymbol *s); int addMember(Scope *sc, ScopeDsymbol *s, int memnum); void setScopeNewSc(Scope *sc, - unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection, + StorageClass newstc, enum LINK linkage, enum PROT protection, int explictProtection, unsigned structalign); void semanticNewSc(Scope *sc, - unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection, + StorageClass newstc, enum LINK linkage, enum PROT protection, int explictProtection, unsigned structalign); void semantic(Scope *sc); void semantic2(Scope *sc); @@ -69,15 +69,15 @@ struct StorageClassDeclaration: AttribDeclaration { - unsigned stc; + StorageClass stc; - StorageClassDeclaration(unsigned stc, Array *decl); + StorageClassDeclaration(StorageClass stc, Array *decl); Dsymbol *syntaxCopy(Dsymbol *s); void setScope(Scope *sc); void semantic(Scope *sc); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); - static void stcToCBuffer(OutBuffer *buf, int stc); + static void stcToCBuffer(OutBuffer *buf, StorageClass stc); }; struct LinkDeclaration : AttribDeclaration