diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-03-20 03:35:02 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-03-20 03:35:02 +0000 |
commit | 576f32c5e1f3ac5555ea20bb9effce2d59ad2fa9 (patch) | |
tree | 56256fffe62b7c90b6ea49e1f8245b26f3f666d6 /lib/Parse/ParseTentative.cpp | |
parent | f48b93cb2054e83e43ca4391b8ec70be89fa2e30 (diff) |
Teach statement / declaration disambiguation about C++11-style generalized initializers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177480 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseTentative.cpp')
-rw-r--r-- | lib/Parse/ParseTentative.cpp | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp index b3cf983bbc..fe602f6b65 100644 --- a/lib/Parse/ParseTentative.cpp +++ b/lib/Parse/ParseTentative.cpp @@ -184,6 +184,9 @@ Parser::TPResult Parser::TryParseSimpleDeclaration(bool AllowForRangeDecl) { return TPResult::Ambiguous(); } +/// Tentatively parse an init-declarator-list in order to disambiguate it from +/// an expression. +/// /// init-declarator-list: /// init-declarator /// init-declarator-list ',' init-declarator @@ -192,14 +195,21 @@ Parser::TPResult Parser::TryParseSimpleDeclaration(bool AllowForRangeDecl) { /// declarator initializer[opt] /// [GNU] declarator simple-asm-expr[opt] attributes[opt] initializer[opt] /// -/// initializer: -/// '=' initializer-clause -/// '(' expression-list ')' +/// initializer: +/// brace-or-equal-initializer +/// '(' expression-list ')' +/// +/// brace-or-equal-initializer: +/// '=' initializer-clause +/// [C++11] braced-init-list /// -/// initializer-clause: -/// assignment-expression -/// '{' initializer-list ','[opt] '}' -/// '{' '}' +/// initializer-clause: +/// assignment-expression +/// braced-init-list +/// +/// braced-init-list: +/// '{' initializer-list ','[opt] '}' +/// '{' '}' /// Parser::TPResult Parser::TryParseInitDeclaratorList() { while (1) { @@ -218,6 +228,10 @@ Parser::TPResult Parser::TryParseInitDeclaratorList() { ConsumeParen(); if (!SkipUntil(tok::r_paren)) return TPResult::Error(); + } else if (Tok.is(tok::l_brace)) { + // A left-brace here is sufficient to disambiguate the parse; an + // expression can never be followed directly by a braced-init-list. + return TPResult::True(); } else if (Tok.is(tok::equal) || isTokIdentifier_in()) { // MSVC and g++ won't examine the rest of declarators if '=' is // encountered; they just conclude that we have a declaration. |