Mercurial > projects > ldc
diff dmd/parse.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 | 8026319762be |
children | 1b24e9c7cc26 |
line wrap: on
line diff
--- a/dmd/parse.h Mon Dec 28 02:23:54 2009 +0000 +++ b/dmd/parse.h Wed Jan 06 15:18:19 2010 -0300 @@ -68,18 +68,24 @@ Array *parseModule(); Array *parseDeclDefs(int once); + Array *parseAutoDeclarations(StorageClass storageClass, unsigned char *comment); Array *parseBlock(); - void composeStorageClass(unsigned stc); + void composeStorageClass(StorageClass stc); + Expression *parseConstraint(); TemplateDeclaration *parseTemplateDeclaration(); - TemplateParameters *parseTemplateParameterList(); + TemplateParameters *parseTemplateParameterList(int flag = 0); Dsymbol *parseMixin(); Objects *parseTemplateArgumentList(); + Objects *parseTemplateArgumentList2(); + Objects *parseTemplateArgument(); StaticAssert *parseStaticAssert(); + TypeQualified *parseTypeof(); enum LINK parseLinkage(); Condition *parseDebugCondition(); Condition *parseVersionCondition(); Condition *parseStaticIfCondition(); - CtorDeclaration *parseCtor(); + Dsymbol *parseCtor(); + PostBlitDeclaration *parsePostBlit(); DtorDeclaration *parseDtor(); StaticCtorDeclaration *parseStaticCtor(); StaticDtorDeclaration *parseStaticDtor(); @@ -92,6 +98,7 @@ Dsymbol *parseAggregate(); BaseClasses *parseBaseClasses(); Import *parseImport(Array *decldefs, int isstatic); + Type *parseType(Identifier **pident = NULL, TemplateParameters **tpl = NULL); Type *parseBasicType(); Type *parseBasicType2(Type *t); Type *parseDeclarator(Type *t, Identifier **pident, TemplateParameters **tpl = NULL); @@ -99,6 +106,7 @@ void parseContracts(FuncDeclaration *f); Statement *parseStatement(int flags); Initializer *parseInitializer(); + Expression *parseDefaultInitExp(); void check(Loc loc, enum TOK value); void check(enum TOK value); void check(enum TOK value, const char *string);