diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2012-02-22 10:50:08 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2012-02-22 10:50:08 +0000 |
| commit | 33deb35535aebe81bed0eaf5c14f3032276a086e (patch) | |
| tree | 1a6b786fd11d1fd4d8c083f85419739e12012c4b /lib/Parse/ParseDeclCXX.cpp | |
| parent | 76517426dc8bf7734c07eefc35171a6bfdba1a2b (diff) | |
Fix parsing and processing initializer lists in return statements and as direct member initializers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151155 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 61ca84136e..cc8c0c45d2 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -2012,7 +2012,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, if (Init.isInvalid()) SkipUntil(tok::comma, true, true); else if (ThisDecl) - Actions.AddInitializerToDecl(ThisDecl, Init.get(), false, + Actions.AddInitializerToDecl(ThisDecl, Init.get(), EqualLoc.isInvalid(), DS.getTypeSpecType() == DeclSpec::TST_auto); } else if (ThisDecl && DS.getStorageClassSpec() == DeclSpec::SCS_static) { // No initializer. @@ -2087,15 +2087,15 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, /// /// pure-specifier: /// '= 0' -/// +/// /// brace-or-equal-initializer: /// '=' initializer-expression -/// braced-init-list [TODO] -/// +/// braced-init-list +/// /// initializer-clause: /// assignment-expression -/// braced-init-list [TODO] -/// +/// braced-init-list +/// /// defaulted/deleted function-definition: /// '=' 'default' /// '=' 'delete' @@ -2137,9 +2137,8 @@ ExprResult Parser::ParseCXXMemberInitializer(Decl *D, bool IsFunction, return ExprResult(); } - return ParseInitializer(); - } else - return ExprError(Diag(Tok, diag::err_generalized_initializer_lists)); + } + return ParseInitializer(); } /// ParseCXXMemberSpecification - Parse the class definition. |