aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseInit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Parse/ParseInit.cpp')
-rw-r--r--lib/Parse/ParseInit.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp
index 5f2dc6d8e5..84e3166473 100644
--- a/lib/Parse/ParseInit.cpp
+++ b/lib/Parse/ParseInit.cpp
@@ -169,9 +169,10 @@ ParseInitializerWithPotentialDesignator(InitListDesignations &Designations,
}
-/// ParseInitializer
+/// ParseBraceInitializer - Called when parsing an initializer that has a
+/// leading open brace.
+///
/// initializer: [C99 6.7.8]
-/// assignment-expression
/// '{' initializer-list '}'
/// '{' initializer-list ',' '}'
/// [GNU] '{' '}'
@@ -180,12 +181,7 @@ ParseInitializerWithPotentialDesignator(InitListDesignations &Designations,
/// designation[opt] initializer
/// initializer-list ',' designation[opt] initializer
///
-Parser::ExprResult Parser::ParseInitializer() {
- // TODO: Split this up into ParseInitializer + ParseBraceInitializer, make
- // ParseInitializer inline so that the non-brace case is short-cut.
- if (Tok.isNot(tok::l_brace))
- return ParseAssignmentExpression();
-
+Parser::ExprResult Parser::ParseBraceInitializer() {
SourceLocation LBraceLoc = ConsumeBrace();
// We support empty initializers, but tell the user that they aren't using