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

Merge remote-tracking branch 'origin/3.2' into HEAD

Browse Source 
Change-Id: I257bb9310bb3bde493aff4cd43091ec63fcb5203
This commit is contained in:
Eike Ziller
2014-07-22 16:11:13 +02:00
parent 341ec7f977 01d0715378
commit 0374a9782e
59 changed files with 100786 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3050,7 +3050,7 @@ bool Parser::parseExpressionStatement(StatementAST *&node)
return parsed;
}
bool Parser::parseStatement(StatementAST *&node)
bool Parser::parseStatement(StatementAST *&node, bool blockLabeledStatement)
{
DEBUG_THIS_RULE();
switch (LA()) {
@@ -3077,6 +3077,8 @@ bool Parser::parseStatement(StatementAST *&node)
case T_CASE:
case T_DEFAULT:
if (blockLabeledStatement)
return false;
return parseLabeledStatement(node);
case T_BREAK:
@@ -3145,8 +3147,11 @@ bool Parser::parseStatement(StatementAST *&node)
}
default:
if (LA() == T_IDENTIFIER && LA(2) == T_COLON)
if (LA() == T_IDENTIFIER && LA(2) == T_COLON) {
if (blockLabeledStatement)
return false;
return parseLabeledStatement(node);
}
return parseExpressionOrDeclarationStatement(node);
} // switch
@@ -3617,7 +3622,7 @@ bool Parser::parseLabeledStatement(StatementAST *&node)
LabeledStatementAST *ast = new (_pool) LabeledStatementAST;
ast->label_token = consumeToken();
ast->colon_token = consumeToken();
parseStatement(ast->statement);
parseStatement(ast->statement, /*blockLabeledStatement =*/ true);
node = ast;
return true;
}
@@ -3627,7 +3632,7 @@ bool Parser::parseLabeledStatement(StatementAST *&node)
LabeledStatementAST *ast = new (_pool) LabeledStatementAST;
ast->label_token = consumeToken();
match(T_COLON, &ast->colon_token);
parseStatement(ast->statement);
parseStatement(ast->statement, /*blockLabeledStatement =*/ true);
node = ast;
return true;
}
@@ -3637,7 +3642,7 @@ bool Parser::parseLabeledStatement(StatementAST *&node)
ast->case_token = consumeToken();
parseConstantExpression(ast->expression);
match(T_COLON, &ast->colon_token);
parseStatement(ast->statement);
parseStatement(ast->statement, /*blockLabeledStatement =*/ true);
node = ast;
return true;
}