maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

refactor tag processing into a new ParseTag method. Share this between 

structs and enums.

llvm-svn: 39298
This commit is contained in:
Chris Lattner 2007-01-25 06:05:38 +00:00
parent 4194315681
commit ffbc271023
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
clang/Parse/ParseDecl.cpp
View File

@ -393,36 +393,21 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS) {
}
}
/// ParseStructUnionSpecifier
/// struct-or-union-specifier: [C99 6.7.2.1]
/// struct-or-union identifier[opt] '{' struct-contents '}'
/// struct-or-union identifier
/// [GNU] struct-or-union attributes[opt] identifier[opt] '{' struct-contents
/// '}' attributes[opt]
/// [GNU] struct-or-union attributes[opt] identifier
/// struct-or-union:
/// 'struct'
/// 'union'
///
void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
assert((Tok.getKind() == tok::kw_struct ||
Tok.getKind() == tok::kw_union) && "Not a struct/union specifier");
DeclSpec::TST TagType =
Tok.getKind() == tok::kw_union ? DeclSpec::TST_union : DeclSpec::TST_struct;
SourceLocation StartLoc = ConsumeToken();
/// ParseTag - Parse "struct-or-union-or-class-or-enum identifier[opt]", where
/// the first token has already been read and has been turned into an instance
/// of DeclSpec::TST (TagType). This returns true if there is an error parsing,
/// otherwise it returns false and fills in Decl.
bool Parser::ParseTag(DeclTy *&Decl, unsigned TagType, SourceLocation StartLoc){
// If attributes exist after tag, parse them.
if (Tok.getKind() == tok::kw___attribute)
ParseAttributes();
// Must have either 'struct name' or 'struct {...}'.
if (Tok.getKind() != tok::identifier &&
Tok.getKind() != tok::l_brace) {
Diag(Tok, diag::err_expected_ident_lbrace);
// TODO: better error recovery here.
return;
return true;
}
// If an identifier is present, consume and remember it.
@ -448,8 +433,33 @@ void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
TK = Action::TK_Declaration;
else
TK = Action::TK_Reference;
DeclTy *TagDecl =
Actions.ParseTag(CurScope, TagType, TK, StartLoc, Name, NameLoc);
Decl = Actions.ParseTag(CurScope, TagType, TK, StartLoc, Name, NameLoc);
return false;
}
/// ParseStructUnionSpecifier
/// struct-or-union-specifier: [C99 6.7.2.1]
/// struct-or-union identifier[opt] '{' struct-contents '}'
/// struct-or-union identifier
/// [GNU] struct-or-union attributes[opt] identifier[opt] '{' struct-contents
/// '}' attributes[opt]
/// [GNU] struct-or-union attributes[opt] identifier
/// struct-or-union:
/// 'struct'
/// 'union'
///
void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
assert((Tok.getKind() == tok::kw_struct ||
Tok.getKind() == tok::kw_union) && "Not a struct/union specifier");
DeclSpec::TST TagType =
Tok.getKind() == tok::kw_union ? DeclSpec::TST_union : DeclSpec::TST_struct;
SourceLocation StartLoc = ConsumeToken();
// Parse the tag portion of this.
DeclTy *TagDecl;
if (ParseTag(TagDecl, TagType, StartLoc))
return;
// If there is a body, parse it and inform the actions module.
if (Tok.getKind() == tok::l_brace)
@ -600,18 +610,10 @@ void Parser::ParseEnumSpecifier(DeclSpec &DS) {
assert(Tok.getKind() == tok::kw_enum && "Not an enum specifier");
SourceLocation StartLoc = ConsumeToken();
if (Tok.getKind() == tok::kw___attribute)
ParseAttributes();
// Must have either 'enum name' or 'enum {...}'.
if (Tok.getKind() != tok::identifier &&
Tok.getKind() != tok::l_brace) {
Diag(Tok, diag::err_expected_ident_lbrace);
// Parse the tag portion of this.
DeclTy *TagDecl;
if (ParseTag(TagDecl, DeclSpec::TST_enum, StartLoc))
return;
}
if (Tok.getKind() == tok::identifier)
ConsumeToken();
if (Tok.getKind() == tok::l_brace) {
SourceLocation LBraceLoc = ConsumeBrace();
@ -648,7 +650,7 @@ void Parser::ParseEnumSpecifier(DeclSpec &DS) {
const char *PrevSpec = 0;
if (DS.SetTypeSpecType(DeclSpec::TST_enum, StartLoc, PrevSpec))
if (DS.SetTypeSpecType(DeclSpec::TST_enum, StartLoc, PrevSpec, TagDecl))
Diag(StartLoc, diag::err_invalid_decl_spec_combination, PrevSpec);
}

1
clang/include/clang/Parse/Parser.h
View File

@ -331,6 +331,7 @@ private:
void ParseDeclarationSpecifiers(DeclSpec &DS);
void ParseSpecifierQualifierList(DeclSpec &DS);
bool ParseTag(DeclTy *&Decl, unsigned TagType, SourceLocation StartLoc);
void ParseEnumSpecifier(DeclSpec &DS);
void ParseStructUnionSpecifier(DeclSpec &DS);
void ParseStructUnionBody(SourceLocation StartLoc, unsigned TagType,