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

Fix bug with expression list parsing.

Browse Source 
Empty lists would have a single null entry, instead of being null
entirely.

Change-Id: I5114cf1e0ecdbcde5631511ad03a8d559668ea80
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christian Kamm
2012-09-20 07:14:26 +02:00
committed by hjk
parent b947861c59
commit 5f6f880a32
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -2677,8 +2677,7 @@ bool Parser::parseInitializerClause0x(ExpressionAST *&node)
if (LA() == T_LBRACE)
return parseBracedInitList0x(node);
parseAssignmentExpression(node);
return true;
return parseAssignmentExpression(node);
}
bool Parser::parseInitializerList0x(ExpressionListAST *&node)
@@ -4775,7 +4774,7 @@ bool Parser::parseCorePostfixExpression(ExpressionAST *&node)
if (lookAtBuiltinTypeSpecifier() &&
parseSimpleTypeSpecifier(type_specifier) &&
(LA() == T_LPAREN || (_cxx0xEnabled && LA() == T_LBRACE))) {
ExpressionAST *expr;
ExpressionAST *expr = 0;
if (LA() == T_LPAREN) {
parseExpressionListParen(expr);
} else { // T_LBRACE