Mercurial > projects > ldc
diff dmd/lexer.h @ 159:5acec6b2eef8 trunk
[svn r175] merged dmd 1.029
author | ChristianK |
---|---|
date | Thu, 01 May 2008 15:15:28 +0200 |
parents | 788401029ecf |
children | aaade6ded589 |
line wrap: on
line diff
--- a/dmd/lexer.h Thu May 01 13:33:02 2008 +0200 +++ b/dmd/lexer.h Thu May 01 15:15:28 2008 +0200 @@ -1,6 +1,6 @@ // Compiler implementation of the D programming language -// Copyright (c) 1999-2007 by Digital Mars +// Copyright (c) 1999-2008 by Digital Mars // All Rights Reserved // written by Walter Bright // http://www.digitalmars.com @@ -92,11 +92,11 @@ TOKand, TOKor, TOKxor, TOKandass, TOKorass, TOKxorass, TOKassign, TOKnot, TOKtilde, - TOKplusplus, TOKminusminus, TOKconstruct, + TOKplusplus, TOKminusminus, TOKconstruct, TOKblit, TOKdot, TOKarrow, TOKcomma, TOKquestion, TOKandand, TOKoror, -// 103 +// 104 // Numeric literals TOKint32v, TOKuns32v, TOKint64v, TOKuns64v, @@ -131,7 +131,7 @@ TOKalign, TOKextern, TOKprivate, TOKprotected, TOKpublic, TOKexport, TOKstatic, /*TOKvirtual,*/ TOKfinal, TOKconst, TOKabstract, TOKvolatile, TOKdebug, TOKdeprecated, TOKin, TOKout, TOKinout, TOKlazy, - TOKauto, TOKpackage, + TOKauto, TOKpackage, TOKmanifest, // Statements TOKif, TOKelse, TOKwhile, TOKfor, TOKdo, TOKswitch, @@ -152,6 +152,8 @@ TOKmacro, #if V2 TOKtraits, + TOKoverloadset, + TOKpure, #endif TOKMAX @@ -261,6 +263,8 @@ static void initKeywords(); static Identifier *idPool(const char *s); + static Identifier *uniqueId(const char *s); + static Identifier *uniqueId(const char *s, int num); TOK nextToken(); void scan(Token *t);