Merge DMD r248: implement Denis Koroskin's macro suggestion

---
 dmd/lexer.c |    2 +-
 dmd/lexer.h |    8 ++++----
 dmd/mars.c  |    2 +-
 dmd/parse.c |   12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)
This commit is contained in:
Leandro Lucarella
2010-01-06 15:18:19 -03:00
parent 7d2c329195
commit 09fb49c546
4 changed files with 12 additions and 12 deletions

View File

@@ -195,7 +195,7 @@ Array *Parser::parseDeclDefs(int once)
break;
}
CASE_BASIC_TYPES:
case BASIC_TYPES:
case TOKalias:
case TOKtypedef:
case TOKidentifier:
@@ -1778,7 +1778,7 @@ Type *Parser::parseBasicType()
//printf("parseBasicType()\n");
switch (token.value)
{
CASE_BASIC_TYPES_X(t):
case BASIC_TYPES_X(t):
nextToken();
break;
@@ -2837,7 +2837,7 @@ Statement *Parser::parseStatement(int flags)
goto Ldeclaration;
}
CASE_BASIC_TYPES:
case BASIC_TYPES:
case TOKtypedef:
case TOKalias:
case TOKconst:
@@ -3630,7 +3630,7 @@ int Parser::isBasicType(Token **pt)
switch (t->value)
{
CASE_BASIC_TYPES:
case BASIC_TYPES:
t = peek(t);
break;
@@ -4270,7 +4270,7 @@ Expression *Parser::parsePrimaryExp()
break;
}
CASE_BASIC_TYPES_X(t):
case BASIC_TYPES_X(t):
nextToken();
L1:
check(TOKdot, t->toChars());
@@ -4766,7 +4766,7 @@ Expression *Parser::parseUnaryExp()
case TOKfile:
case TOKline:
#endif
CASE_BASIC_TYPES: // (type)int.size
case BASIC_TYPES: // (type)int.size
{ // (type) una_exp
Type *t;