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

C++: handle @try statements in the parser.

Browse Source 
No semantic analysis yet, but this prevents the parser from generating
bogus diagnostics.

Task-number: QTCREATORBUG-9309
Change-Id: I2ec575a8474cd51bfa97b17678d3da71ab8dcd7a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2013-07-18 10:04:28 +02:00
parent 61367fc6ab
commit 23085895d6
3 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,6 +333,7 @@ bool Parser::skipUntilStatement()
case T_USING:
return true;
case T_AT_TRY:
case T_AT_SYNCHRONIZED:
if (objCEnabled())
return true;
@@ -3106,6 +3107,9 @@ bool Parser::parseStatement(StatementAST *&node)
return true;
}
case T_AT_TRY:
return objCEnabled() && parseObjCTryStatement(node);
case T_AT_SYNCHRONIZED:
return objCEnabled() && parseObjCSynchronizedStatement(node);
@@ -4404,6 +4408,50 @@ bool Parser::parseObjCStringLiteral(ExpressionAST *&node)
return true;
}
/// objc-try-catch-statement:
/// @try compound-statement objc-catch-list[opt]
/// @try compound-statement objc-catch-list[opt] @finally compound-statement
///
/// objc-catch-list:
/// @catch ( parameter-declaration ) compound-statement
/// objc-catch-list @catch ( catch-parameter-declaration ) compound-statement
/// catch-parameter-declaration:
/// parameter-declaration
/// '...' [OBJC2]
///
bool Parser::parseObjCTryStatement(StatementAST *& /*node*/)
{
DEBUG_THIS_RULE();
if (LA() != T_AT_TRY)
return false;
/*try_token =*/ consumeToken();
StatementAST *body_statment;
parseCompoundStatement(body_statment);
while (LA() == T_AT_CATCH) {
/*catch_token =*/ consumeToken();
unsigned lparen_token;
match(T_LPAREN, &lparen_token);
if (LA() == T_DOT_DOT_DOT) {
/*unsigned ellipsis_token =*/ consumeToken();
} else {
ParameterDeclarationAST *exception_decl;
parseParameterDeclaration(exception_decl);
}
unsigned rparen_token;
match(T_RPAREN, &rparen_token);
StatementAST *catch_statement;
parseCompoundStatement(catch_statement);
}
if (LA() == T_AT_FINALLY) {
StatementAST *finally_statement;
parseCompoundStatement(finally_statement);
}
return true;
}
bool Parser::parseObjCSynchronizedStatement(StatementAST *&node)
{
DEBUG_THIS_RULE();