Added Parser::ParseStructDeclaration() as a result of refactoring Parser::ParseStruct...

Motivation: Objective-C can now share this rule. It also makes Parser::ParseStructUnionBody()
a bit smaller/cleaner..

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41201 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index 97f3661e3b1ba539fcda1e7a696e983b8a5386bf..62545634d01a073a2d67a1d27c490a6fc8f89afb 100644 (file)
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -599,16 +599,7 @@ void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
     Diag(StartLoc, diag::err_invalid_decl_spec_combination, PrevSpec);
 }
 
-
-/// ParseStructUnionBody
-///       struct-contents:
-///         struct-declaration-list
-/// [EXT]   empty
-/// [GNU]   "struct-declaration-list" without terminatoring ';'
-///       struct-declaration-list:
-///         struct-declaration
-///         struct-declaration-list struct-declaration
-/// [OBC]   '@' 'defs' '(' class-name ')'                         [TODO]
+/// ParseStructDeclaration
 ///       struct-declaration:
 ///         specifier-qualifier-list struct-declarator-list ';'
 /// [GNU]   __extension__ struct-declaration
@@ -623,6 +614,83 @@ void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
 ///         declarator[opt] ':' constant-expression
 /// [GNU]   declarator[opt] ':' constant-expression attributes[opt]
 ///
+void Parser::ParseStructDeclaration(DeclTy *TagDecl,
+  llvm::SmallVector<DeclTy*, 32> &FieldDecls) {
+  // FIXME: When __extension__ is specified, disable extension diagnostics.
+  if (Tok.getKind() == tok::kw___extension__)
+    ConsumeToken();
+  
+  // Parse the common specifier-qualifiers-list piece.
+  DeclSpec DS;
+  SourceLocation SpecQualLoc = Tok.getLocation();
+  ParseSpecifierQualifierList(DS);
+  // TODO: Does specifier-qualifier list correctly check that *something* is
+  // specified?
+  
+  // If there are no declarators, issue a warning.
+  if (Tok.getKind() == tok::semi) {
+    Diag(SpecQualLoc, diag::w_no_declarators);
+    ConsumeToken();
+    return;
+  }
+
+  // Read struct-declarators until we find the semicolon.
+  Declarator DeclaratorInfo(DS, Declarator::MemberContext);
+
+  while (1) {
+    /// struct-declarator: declarator
+    /// struct-declarator: declarator[opt] ':' constant-expression
+    if (Tok.getKind() != tok::colon)
+      ParseDeclarator(DeclaratorInfo);
+    
+    ExprTy *BitfieldSize = 0;
+    if (Tok.getKind() == tok::colon) {
+      ConsumeToken();
+      ExprResult Res = ParseConstantExpression();
+      if (Res.isInvalid) {
+        SkipUntil(tok::semi, true, true);
+      } else {
+        BitfieldSize = Res.Val;
+      }
+    }
+    
+    // If attributes exist after the declarator, parse them.
+    if (Tok.getKind() == tok::kw___attribute)
+      DeclaratorInfo.AddAttributes(ParseAttributes());
+    
+    // Install the declarator into the current TagDecl.
+    DeclTy *Field = Actions.ParseField(CurScope, TagDecl, SpecQualLoc,
+                                       DeclaratorInfo, BitfieldSize);
+    FieldDecls.push_back(Field);
+    
+    // If we don't have a comma, it is either the end of the list (a ';')
+    // or an error, bail out.
+    if (Tok.getKind() != tok::comma)
+      break;
+    
+    // Consume the comma.
+    ConsumeToken();
+    
+    // Parse the next declarator.
+    DeclaratorInfo.clear();
+    
+    // Attributes are only allowed on the second declarator.
+    if (Tok.getKind() == tok::kw___attribute)
+      DeclaratorInfo.AddAttributes(ParseAttributes());
+  }
+  return;
+}
+
+/// ParseStructUnionBody
+///       struct-contents:
+///         struct-declaration-list
+/// [EXT]   empty
+/// [GNU]   "struct-declaration-list" without terminatoring ';'
+///       struct-declaration-list:
+///         struct-declaration
+///         struct-declaration-list struct-declaration
+/// [OBC]   '@' 'defs' '(' class-name ')'                         [TODO]
+///
 void Parser::ParseStructUnionBody(SourceLocation RecordLoc,
                                   unsigned TagType, DeclTy *TagDecl) {
   SourceLocation LBraceLoc = ConsumeBrace();
@@ -646,70 +714,8 @@ void Parser::ParseStructUnionBody(SourceLocation RecordLoc,
       ConsumeToken();
       continue;
     }
+    ParseStructDeclaration(TagDecl, FieldDecls);
 
-    // FIXME: When __extension__ is specified, disable extension diagnostics.
-    if (Tok.getKind() == tok::kw___extension__)
-      ConsumeToken();
-    
-    // Parse the common specifier-qualifiers-list piece.
-    DeclSpec DS;
-    SourceLocation SpecQualLoc = Tok.getLocation();
-    ParseSpecifierQualifierList(DS);
-    // TODO: Does specifier-qualifier list correctly check that *something* is
-    // specified?
-    
-    // If there are no declarators, issue a warning.
-    if (Tok.getKind() == tok::semi) {
-      Diag(SpecQualLoc, diag::w_no_declarators);
-      ConsumeToken();
-      continue;
-    }
-
-    // Read struct-declarators until we find the semicolon.
-    Declarator DeclaratorInfo(DS, Declarator::MemberContext);
-
-    while (1) {
-      /// struct-declarator: declarator
-      /// struct-declarator: declarator[opt] ':' constant-expression
-      if (Tok.getKind() != tok::colon)
-        ParseDeclarator(DeclaratorInfo);
-      
-      ExprTy *BitfieldSize = 0;
-      if (Tok.getKind() == tok::colon) {
-        ConsumeToken();
-        ExprResult Res = ParseConstantExpression();
-        if (Res.isInvalid) {
-          SkipUntil(tok::semi, true, true);
-        } else {
-          BitfieldSize = Res.Val;
-        }
-      }
-      
-      // If attributes exist after the declarator, parse them.
-      if (Tok.getKind() == tok::kw___attribute)
-        DeclaratorInfo.AddAttributes(ParseAttributes());
-      
-      // Install the declarator into the current TagDecl.
-      DeclTy *Field = Actions.ParseField(CurScope, TagDecl, SpecQualLoc,
-                                         DeclaratorInfo, BitfieldSize);
-      FieldDecls.push_back(Field);
-      
-      // If we don't have a comma, it is either the end of the list (a ';')
-      // or an error, bail out.
-      if (Tok.getKind() != tok::comma)
-        break;
-      
-      // Consume the comma.
-      ConsumeToken();
-      
-      // Parse the next declarator.
-      DeclaratorInfo.clear();
-      
-      // Attributes are only allowed on the second declarator.
-      if (Tok.getKind() == tok::kw___attribute)
-        DeclaratorInfo.AddAttributes(ParseAttributes());
-    }
-    
     if (Tok.getKind() == tok::semi) {
       ConsumeToken();
     } else if (Tok.getKind() == tok::r_brace) {

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index eb0b319e078d1e49f50ad761fe0bd7421c5fd9e4..ea69da3751c1d30b4bc794ee7abf91c247f4fee5 100644 (file)
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -359,7 +359,9 @@ private:
   void ParseStructUnionSpecifier(DeclSpec &DS);
   void ParseStructUnionBody(SourceLocation StartLoc, unsigned TagType,
                             DeclTy *TagDecl);
-
+  void ParseStructDeclaration(DeclTy *TagDecl,
+     llvm::SmallVector<DeclTy*, 32> &FieldDecls);
+  
   bool isDeclarationSpecifier() const;
   bool isTypeSpecifierQualifier() const;