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

C++11: Allow brace initializers in return statements.

Browse Source 
Like return {1, 2};

Change-Id: I7442da1866b0106bc075783653c95c16ebedb51a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christian Kamm
2012-09-12 14:35:49 +02:00
committed by hjk
parent bd04f2edbf
commit 0bdf1dc406
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3102,6 +3102,9 @@ bool Parser::parseReturnStatement(StatementAST *&node)
if (LA() == T_RETURN) { if (LA() == T_RETURN) {
ReturnStatementAST *ast = new (_pool) ReturnStatementAST; ReturnStatementAST *ast = new (_pool) ReturnStatementAST;
ast->return_token = consumeToken(); ast->return_token = consumeToken();
if (_cxx0xEnabled && LA() == T_LBRACE)
parseBracedInitList0x(ast->expression);
else
parseExpression(ast->expression); parseExpression(ast->expression);
match(T_SEMICOLON, &ast->semicolon_token); match(T_SEMICOLON, &ast->semicolon_token);
node = ast; node = ast;

4
tests/auto/cplusplus/cxx11/data/braceInitializers.1.cpp
View File

@@ -12,3 +12,7 @@ void main() {
Type var2{{1, 2, 3}, 4}; Type var2{{1, 2, 3}, 4};
var3 += {1, 2}; var3 += {1, 2};
} }
T foo() {
return {1, 2, {"foo", 7}};
}