aboutsummaryrefslogtreecommitdiff
path: root/Parse/ParseDecl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Parse/ParseDecl.cpp')
-rw-r--r--Parse/ParseDecl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index 80ff5757e0..a525792ff8 100644
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -630,11 +630,13 @@ void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
Diag(StartLoc, diag::err_invalid_decl_spec_combination, PrevSpec);
}
-/// ParseStructDeclaration
+/// ParseStructDeclaration - Parse a struct declaration without the terminating
+/// semicolon.
+///
/// struct-declaration:
-/// specifier-qualifier-list struct-declarator-list ';'
+/// specifier-qualifier-list struct-declarator-list
/// [GNU] __extension__ struct-declaration
-/// [GNU] specifier-qualifier-list ';'
+/// [GNU] specifier-qualifier-list
/// struct-declarator-list:
/// struct-declarator
/// struct-declarator-list ',' struct-declarator
@@ -661,7 +663,6 @@ void Parser::ParseStructDeclaration(DeclTy *TagDecl,
// If there are no declarators, issue a warning.
if (Tok.is(tok::semi)) {
Diag(SpecQualLoc, diag::w_no_declarators);
- ConsumeToken();
return;
}
@@ -697,7 +698,7 @@ void Parser::ParseStructDeclaration(DeclTy *TagDecl,
// If we don't have a comma, it is either the end of the list (a ';')
// or an error, bail out.
if (Tok.isNot(tok::comma))
- break;
+ return;
// Consume the comma.
ConsumeToken();
@@ -709,7 +710,6 @@ void Parser::ParseStructDeclaration(DeclTy *TagDecl,
if (Tok.is(tok::kw___attribute))
DeclaratorInfo.AddAttributes(ParseAttributes());
}
- return;
}
/// ParseStructUnionBody