comparison 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
comparison
equal deleted inserted replaced
1601:49722e6e6e05 1602:a413ae7329bf
35 35
36 AttribDeclaration(Array *decl); 36 AttribDeclaration(Array *decl);
37 virtual Array *include(Scope *sc, ScopeDsymbol *s); 37 virtual Array *include(Scope *sc, ScopeDsymbol *s);
38 int addMember(Scope *sc, ScopeDsymbol *s, int memnum); 38 int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
39 void setScopeNewSc(Scope *sc, 39 void setScopeNewSc(Scope *sc,
40 unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection, 40 StorageClass newstc, enum LINK linkage, enum PROT protection, int explictProtection,
41 unsigned structalign); 41 unsigned structalign);
42 void semanticNewSc(Scope *sc, 42 void semanticNewSc(Scope *sc,
43 unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection, 43 StorageClass newstc, enum LINK linkage, enum PROT protection, int explictProtection,
44 unsigned structalign); 44 unsigned structalign);
45 void semantic(Scope *sc); 45 void semantic(Scope *sc);
46 void semantic2(Scope *sc); 46 void semantic2(Scope *sc);
47 void semantic3(Scope *sc); 47 void semantic3(Scope *sc);
48 void inlineScan(); 48 void inlineScan();
67 #endif 67 #endif
68 }; 68 };
69 69
70 struct StorageClassDeclaration: AttribDeclaration 70 struct StorageClassDeclaration: AttribDeclaration
71 { 71 {
72 unsigned stc; 72 StorageClass stc;
73 73
74 StorageClassDeclaration(unsigned stc, Array *decl); 74 StorageClassDeclaration(StorageClass stc, Array *decl);
75 Dsymbol *syntaxCopy(Dsymbol *s); 75 Dsymbol *syntaxCopy(Dsymbol *s);
76 void setScope(Scope *sc); 76 void setScope(Scope *sc);
77 void semantic(Scope *sc); 77 void semantic(Scope *sc);
78 void toCBuffer(OutBuffer *buf, HdrGenState *hgs); 78 void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
79 79
80 static void stcToCBuffer(OutBuffer *buf, int stc); 80 static void stcToCBuffer(OutBuffer *buf, StorageClass stc);
81 }; 81 };
82 82
83 struct LinkDeclaration : AttribDeclaration 83 struct LinkDeclaration : AttribDeclaration
84 { 84 {
85 enum LINK linkage; 85 enum LINK linkage;