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

Added AST nodes for compound expressions (a GNU extension).

Browse Source
This commit is contained in:
Erik Verbruggen
2010-02-04 14:55:18 +01:00
parent 7cdb15e7fc
commit fd90c3503d
14 changed files with 111 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3437,7 +3437,19 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
return parseThisExpression(node);
case T_LPAREN:
return parseNestedExpression(node);
if (LA(2) == T_LBRACE) {
// GNU extension: '(' '{' statement-list '}' ')'
CompoundExpressionAST *ast = new (_pool) CompoundExpressionAST;
ast->lparen_token = consumeToken();
StatementAST *statement = 0;
parseCompoundStatement(statement);
ast->compoundStatement = statement->asCompoundStatement();
match(T_RPAREN, &ast->rparen_token);
node = ast;
return true;
} else {
return parseNestedExpression(node);
}
case T_SIGNAL:
case T_SLOT:
@@ -3799,19 +3811,6 @@ bool Parser::parseNestedExpression(ExpressionAST *&node)
DEBUG_THIS_RULE();
if (LA() == T_LPAREN) {
unsigned lparen_token = consumeToken();
if (LA() == T_LBRACE) {
NestedExpressionAST *ast = new (_pool) NestedExpressionAST;
ast->lparen_token = lparen_token;
// ### ast
StatementAST *statement = 0;
parseCompoundStatement(statement);
match(T_RPAREN, &ast->rparen_token);
node = ast;
return true;
}
bool previousTemplateArguments = switchTemplateArguments(false);
ExpressionAST *expression = 0;
@@ -5275,12 +5274,11 @@ bool Parser::parseObjCContextKeyword(int kind, unsigned &in_token)
{
DEBUG_THIS_RULE();
if (peekAtObjCContextKeyword(kind)) {
in_token = consumeToken();
return true;
} else {
if (!peekAtObjCContextKeyword(kind))
return false;
}
in_token = consumeToken();
return true;
}