feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed throw expression parsing.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-02-02 15:38:21 +01:00
parent fac977a5bd
commit a3d0406d31
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/shared/cplusplus/Parser.cpp
View File

@@ -182,7 +182,10 @@ inline bool isRightAssociative(int tokenKind)
#endif
#define PARSE_EXPRESSION_WITH_OPERATOR_PRECEDENCE(node, minPrecedence) { \
if (!parseCastExpression(node)) \
if (LA() == T_THROW) { \
if (!parseThrowExpression(node)) \
return false; \
} else if (!parseCastExpression(node)) \
return false; \
\
parseExpressionWithOperatorPrecedence(node, minPrecedence); \
@@ -2322,14 +2325,27 @@ bool Parser::parseStringLiteral(ExpressionAST *&node)
bool Parser::parseExpressionStatement(StatementAST *&node)
{
DEBUG_THIS_RULE();
ExpressionAST *expression = 0;
if (LA() == T_SEMICOLON || parseExpression(expression)) {
if (LA() == T_SEMICOLON) {
ExpressionStatementAST *ast = new (_pool) ExpressionStatementAST;
ast->expression = expression;
match(T_SEMICOLON, &ast->semicolon_token);
node = ast;
return true;
}
ExpressionAST *expression = 0;
MemoryPool *oldPool = _pool;
MemoryPool tmp;
_pool = &tmp;
if (parseExpression(expression)) {
ExpressionStatementAST *ast = new (oldPool) ExpressionStatementAST;
ast->expression = expression->clone(oldPool);
match(T_SEMICOLON, &ast->semicolon_token);
node = ast;
_pool = oldPool;
return true;
}
_pool = oldPool;
return false;
}