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

[C++11] Fixes semantics for trailing return types.

Browse Source 
Now we can parse:
    auto foo()->int;
without getting semantic errors.

Change-Id: Id65c1198c20b2b0c7e8e4eee8ad176d0d66fc0d7
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-02-23 15:19:26 +01:00
parent 3c635ef1d4
commit 2153c22812
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/3rdparty/cplusplus/Bind.cpp vendored
View File

@@ -358,12 +358,13 @@ FullySpecifiedType Bind::declarator(DeclaratorAST *ast, const FullySpecifiedType
if (type.isAuto())
isAuto = true;
}
// unsigned equals_token = ast->equals_token;
ExpressionTy initializer = this->expression(ast->initializer);
if (translationUnit()->cxx0xEnabled() && isAuto) {
if (!type->isFunctionType()) {
ExpressionTy initializer = this->expression(ast->initializer);
if (translationUnit()->cxx0xEnabled() && isAuto) {
type = initializer;
type.setAuto(true);
type = initializer;
type.setAuto(true);
}
}
std::swap(_declaratorId, declaratorId);
@@ -3085,6 +3086,8 @@ bool Bind::visit(FunctionDeclaratorAST *ast)
Function *fun = control()->newFunction(0, 0);
fun->setStartOffset(tokenAt(ast->firstToken()).begin());
fun->setEndOffset(tokenAt(ast->lastToken() - 1).end());
if (ast->trailing_return_type)
_type = this->trailingReturnType(ast->trailing_return_type, _type);
fun->setReturnType(_type);
// unsigned lparen_token = ast->lparen_token;
@@ -3100,7 +3103,6 @@ bool Bind::visit(FunctionDeclaratorAST *ast)
fun->setVolatile(type.isVolatile());
this->exceptionSpecification(ast->exception_specification, type);
this->trailingReturnType(ast->trailing_return_type, type);
if (ast->as_cpp_initializer != 0) {
fun->setAmbiguous(true);
/*ExpressionTy as_cpp_initializer =*/ this->expression(ast->as_cpp_initializer);