Mercurial > projects > ldc
comparison dmd/aggregate.h @ 1587:def7a1d494fd
Merge DMD 1.051
author | Christian Kamm <kamm incasoftware de> |
---|---|
date | Fri, 06 Nov 2009 23:58:01 +0100 |
parents | 05c235309d6f |
children | a413ae7329bf |
comparison
equal
deleted
inserted
replaced
1586:7f728c52e63c | 1587:def7a1d494fd |
---|---|
60 unsigned sizeok; // set when structsize contains valid data | 60 unsigned sizeok; // set when structsize contains valid data |
61 // 0: no size | 61 // 0: no size |
62 // 1: size is correct | 62 // 1: size is correct |
63 // 2: cannot determine size; fwd referenced | 63 // 2: cannot determine size; fwd referenced |
64 int isdeprecated; // !=0 if deprecated | 64 int isdeprecated; // !=0 if deprecated |
65 Scope *scope; // !=NULL means context to use | |
66 | 65 |
67 // Special member functions | 66 // Special member functions |
68 InvariantDeclaration *inv; // invariant | 67 InvariantDeclaration *inv; // invariant |
69 NewDeclaration *aggNew; // allocator | 68 NewDeclaration *aggNew; // allocator |
70 DeleteDeclaration *aggDelete; // deallocator | 69 DeleteDeclaration *aggDelete; // deallocator |
70 | |
71 #if DMDV2 | |
72 //CtorDeclaration *ctor; | |
73 Dsymbol *ctor; // CtorDeclaration or TemplateDeclaration | |
74 CtorDeclaration *defaultCtor; // default constructor | |
75 Dsymbol *aliasthis; // forward unresolved lookups to aliasthis | |
76 #endif | |
71 | 77 |
72 FuncDeclarations dtors; // Array of destructors | 78 FuncDeclarations dtors; // Array of destructors |
73 FuncDeclaration *dtor; // aggregate destructor | 79 FuncDeclaration *dtor; // aggregate destructor |
74 | 80 |
75 #ifdef IN_GCC | 81 #ifdef IN_GCC |
86 void addField(Scope *sc, VarDeclaration *v); | 92 void addField(Scope *sc, VarDeclaration *v); |
87 int isDeprecated(); // is aggregate deprecated? | 93 int isDeprecated(); // is aggregate deprecated? |
88 FuncDeclaration *buildDtor(Scope *sc); | 94 FuncDeclaration *buildDtor(Scope *sc); |
89 | 95 |
90 void emitComment(Scope *sc); | 96 void emitComment(Scope *sc); |
97 void toJsonBuffer(OutBuffer *buf); | |
91 void toDocBuffer(OutBuffer *buf); | 98 void toDocBuffer(OutBuffer *buf); |
92 | 99 |
93 // For access checking | 100 // For access checking |
94 virtual PROT getAccess(Dsymbol *smember); // determine access to smember | 101 virtual PROT getAccess(Dsymbol *smember); // determine access to smember |
95 int isFriendOf(AggregateDeclaration *cd); | 102 int isFriendOf(AggregateDeclaration *cd); |