summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/Parser.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-11-13 12:36:51 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2009-11-13 12:38:18 +0100
commitbaffd97efb1fd6da004fedf620577f8a97445793 (patch)
tree5131ff5b8f40d3d76ae9ed993093f1668b7a7c31 /src/shared/cplusplus/Parser.cpp
parent28ab85b13794f2443cfd714bbf1daa5e91bc6b2a (diff)
downloadqt-creator-baffd97efb1fd6da004fedf620577f8a97445793.tar.gz
Fixed parsing of ctor-initializers and added a manual test for the AST matchers
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
-rw-r--r--src/shared/cplusplus/Parser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index 36b7d03e1c..5614355ab4 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -1849,7 +1849,7 @@ bool Parser::parseMemInitializer(MemInitializerListAST *&node)
MemInitializerAST *ast = new (_pool) MemInitializerAST;
ast->name = name;
ast->lparen_token = consumeToken();
- parseExpression(ast->expression);
+ parseExpressionList(ast->expression_list);
if (LA() == T_RPAREN)
ast->rparen_token = consumeToken();
@@ -1896,7 +1896,7 @@ bool Parser::parseExpressionList(ExpressionListAST *&node)
while (LA() == T_COMMA) {
consumeToken(); // consume T_COMMA
- if (parseExpression(expression)) {
+ if (parseAssignmentExpression(expression)) {
*expression_list_ptr = new (_pool) ExpressionListAST;
(*expression_list_ptr)->value = expression;
expression_list_ptr = &(*expression_list_ptr)->next;