refactor Parser::ParseStructDeclaration to return a vector of uninterpreted
declarators. This allows the clients (C structs, objc classes, objc
properties, [future] C++ classes) etc, to do custom processing before invoking
an action.
This has two benefits in the short term:
1) objc ivar processing should be split out of ActOnField into its own ActOn method.
2) the new objc ivar action can take visibility info directly, eliminating
AllVisibilities in ParseObjCClassInstanceVariables.
3) objc properties can pass their own special sauce down to sema as well.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49468 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 7728704..1d41248 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -657,14 +657,14 @@
/// declarator[opt] ':' constant-expression
/// [GNU] declarator[opt] ':' constant-expression attributes[opt]
///
-void Parser::ParseStructDeclaration(DeclTy *TagDecl,
- llvm::SmallVectorImpl<DeclTy*> &FieldDecls) {
+void Parser::
+ParseStructDeclaration(DeclSpec &DS,
+ llvm::SmallVectorImpl<FieldDeclarator> &Fields) {
// FIXME: When __extension__ is specified, disable extension diagnostics.
- if (Tok.is(tok::kw___extension__))
+ while (Tok.is(tok::kw___extension__))
ConsumeToken();
// Parse the common specifier-qualifiers-list piece.
- DeclSpec DS;
SourceLocation DSStart = Tok.getLocation();
ParseSpecifierQualifierList(DS);
// TODO: Does specifier-qualifier list correctly check that *something* is
@@ -677,33 +677,27 @@
}
// Read struct-declarators until we find the semicolon.
- Declarator DeclaratorInfo(DS, Declarator::MemberContext);
-
+ Fields.push_back(DS);
while (1) {
+ FieldDeclarator &DeclaratorInfo = Fields.back();
+
/// struct-declarator: declarator
/// struct-declarator: declarator[opt] ':' constant-expression
if (Tok.isNot(tok::colon))
- ParseDeclarator(DeclaratorInfo);
+ ParseDeclarator(DeclaratorInfo.D);
- ExprTy *BitfieldSize = 0;
if (Tok.is(tok::colon)) {
ConsumeToken();
ExprResult Res = ParseConstantExpression();
if (Res.isInvalid)
SkipUntil(tok::semi, true, true);
else
- BitfieldSize = Res.Val;
+ DeclaratorInfo.BitfieldSize = Res.Val;
}
// If attributes exist after the declarator, parse them.
if (Tok.is(tok::kw___attribute))
- DeclaratorInfo.AddAttributes(ParseAttributes());
-
- // Install the declarator into the current TagDecl.
- DeclTy *Field = Actions.ActOnField(CurScope, TagDecl,
- DS.getSourceRange().getBegin(),
- DeclaratorInfo, BitfieldSize);
- FieldDecls.push_back(Field);
+ DeclaratorInfo.D.AddAttributes(ParseAttributes());
// If we don't have a comma, it is either the end of the list (a ';')
// or an error, bail out.
@@ -714,11 +708,11 @@
ConsumeToken();
// Parse the next declarator.
- DeclaratorInfo.clear();
+ Fields.push_back(DS);
// Attributes are only allowed on the second declarator.
if (Tok.is(tok::kw___attribute))
- DeclaratorInfo.AddAttributes(ParseAttributes());
+ Fields.back().D.AddAttributes(ParseAttributes());
}
}
@@ -743,7 +737,8 @@
DeclSpec::getSpecifierName((DeclSpec::TST)TagType));
llvm::SmallVector<DeclTy*, 32> FieldDecls;
-
+ llvm::SmallVector<FieldDeclarator, 8> FieldDeclarators;
+
// While we still have something to read, read the declarations in the struct.
while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof)) {
// Each iteration of this loop reads one struct-declaration.
@@ -754,7 +749,22 @@
ConsumeToken();
continue;
}
- ParseStructDeclaration(TagDecl, FieldDecls);
+
+ // Parse all the comma separated declarators.
+ DeclSpec DS;
+ FieldDeclarators.clear();
+ ParseStructDeclaration(DS, FieldDeclarators);
+
+ // Convert them all to fields.
+ for (unsigned i = 0, e = FieldDeclarators.size(); i != e; ++i) {
+ FieldDeclarator &FD = FieldDeclarators[i];
+ // Install the declarator into the current TagDecl.
+ DeclTy *Field = Actions.ActOnField(CurScope, TagDecl,
+ DS.getSourceRange().getBegin(),
+ FD.D, FD.BitfieldSize);
+ FieldDecls.push_back(Field);
+ }
+
if (Tok.is(tok::semi)) {
ConsumeToken();