replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Parse struct/union specifiers. 

llvm-svn: 38897
This commit is contained in:
Chris Lattner 2006-08-13 01:16:23 +00:00
parent 3b561a3b39
commit 1890ac8b03
3 changed files with 177 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
clang/Parse/ParseDecl.cpp
View File

@ -26,24 +26,7 @@ using namespace clang;
void Parser::ParseTypeName() {
// Parse the common declaration-specifiers piece.
DeclSpec DS;
SourceLocation Loc = Tok.getLocation();
ParseDeclarationSpecifiers(DS);
// Validate declspec for type-name.
unsigned Specs = DS.getParsedSpecifiers();
if (Specs == DeclSpec::PQ_None)
Diag(Tok, diag::err_typename_requires_specqual);
if (Specs & DeclSpec::PQ_StorageClassSpecifier) {
Diag(Loc, diag::err_typename_invalid_storageclass);
// Remove storage class.
DS.StorageClassSpec = DeclSpec::SCS_unspecified;
DS.SCS_thread_specified = false;
}
if (Specs & DeclSpec::PQ_FunctionSpecifier) {
Diag(Loc, diag::err_typename_invalid_functionspec);
DS.FS_inline_specified = false;
}
ParseSpecifierQualifierList(DS);
// Parse the abstract-declarator, if present.
Declarator DeclaratorInfo(DS, Declarator::TypeNameContext);
@ -102,6 +85,33 @@ void Parser::ParseInitDeclaratorListAfterFirstDeclarator(Declarator &D) {
}
}
/// ParseSpecifierQualifierList
/// specifier-qualifier-list:
/// type-specifier specifier-qualifier-list[opt]
/// type-qualifier specifier-qualifier-list[opt]
///
void Parser::ParseSpecifierQualifierList(DeclSpec &DS) {
/// specifier-qualifier-list is a subset of declaration-specifiers. Just
/// parse declaration-specifiers and complain about extra stuff.
SourceLocation Loc = Tok.getLocation();
ParseDeclarationSpecifiers(DS);
// Validate declspec for type-name.
unsigned Specs = DS.getParsedSpecifiers();
if (Specs == DeclSpec::PQ_None)
Diag(Tok, diag::err_typename_requires_specqual);
if (Specs & DeclSpec::PQ_StorageClassSpecifier) {
Diag(Loc, diag::err_typename_invalid_storageclass);
// Remove storage class.
DS.StorageClassSpec = DeclSpec::SCS_unspecified;
DS.SCS_thread_specified = false;
}
if (Specs & DeclSpec::PQ_FunctionSpecifier) {
Diag(Loc, diag::err_typename_invalid_functionspec);
DS.FS_inline_specified = false;
}
}
/// ParseDeclarationSpecifiers
/// declaration-specifiers: [C99 6.7]
@ -128,7 +138,7 @@ void Parser::ParseInitDeclaratorListAfterFirstDeclarator(Declarator &D) {
/// 'double'
/// 'signed'
/// 'unsigned'
/// struct-or-union-specifier [TODO]
/// struct-or-union-specifier
/// enum-specifier
/// typedef-name [TODO]
/// [C99] '_Bool'
@ -240,8 +250,10 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS) {
isInvalid = DS.SetTypeSpecType(DeclSpec::TST_decimal128, PrevSpec);
break;
//case tok::kw_struct:
//case tok::kw_union:
case tok::kw_struct:
case tok::kw_union:
ParseStructUnionSpecifier(DS);
continue;
case tok::kw_enum:
ParseEnumSpecifier(DS);
continue;
@ -278,17 +290,124 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS) {
}
}
/// ParseStructUnionSpecifier
/// struct-or-union-specifier: [C99 6.7.2.1]
/// struct-or-union identifier[opt] '{' struct-declaration-list '}'
/// struct-or-union identifier
/// struct-or-union:
/// 'struct'
/// 'union'
/// struct-declaration-list:
/// struct-declaration
/// struct-declaration-list struct-declaration
/// struct-declaration:
/// specifier-qualifier-list struct-declarator-list ';'
/// struct-declarator-list:
/// struct-declarator
/// struct-declarator-list ',' struct-declarator
/// struct-declarator:
/// declarator
/// declarator[opt] ':' constant-expression
///
void Parser::ParseStructUnionSpecifier(DeclSpec &DS) {
assert((Tok.getKind() == tok::kw_struct ||
Tok.getKind() == tok::kw_union) && "Not a struct/union specifier");
bool isUnion = Tok.getKind() == tok::kw_union;
ConsumeToken();
// Must have either 'struct name' or 'struct {...}'.
if (Tok.getKind() != tok::identifier &&
Tok.getKind() != tok::l_brace) {
Diag(Tok, diag::err_expected_ident_lbrace);
return;
}
if (Tok.getKind() == tok::identifier)
ConsumeToken();
if (Tok.getKind() != tok::l_brace)
return;
SourceLocation LBraceLoc = Tok.getLocation();
ConsumeBrace();
if (Tok.getKind() == tok::r_brace)
Diag(Tok, diag::ext_empty_struct_union_enum, isUnion ? "union" : "struct");
while (Tok.getKind() != tok::r_brace &&
Tok.getKind() != tok::eof) {
// Each iteration of this loop reads one struct-declaration.
// 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?
Declarator DeclaratorInfo(DS, Declarator::MemberContext);
// If there are no declarators, issue a warning.
if (Tok.getKind() == tok::semi) {
Diag(SpecQualLoc, diag::w_no_declarators);
} else {
// Read struct-declarators until we find the semicolon.
while (1) {
/// struct-declarator: declarator
/// struct-declarator: declarator[opt] ':' constant-expression
if (Tok.getKind() != tok::colon)
ParseDeclarator(DeclaratorInfo);
if (Tok.getKind() == tok::colon) {
ConsumeToken();
ExprResult Res = ParseConstantExpression();
if (Res.isInvalid) {
SkipUntil(tok::semi, true, true);
} else {
// Process it.
}
}
// TODO: install declarator.
// 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();
}
}
if (Tok.getKind() == tok::semi) {
ConsumeToken();
} else {
Diag(Tok, diag::err_expected_semi_decl_list);
// Skip to end of block or statement
SkipUntil(tok::r_brace, true, true);
}
}
MatchRHSPunctuation(tok::r_brace, LBraceLoc, "{",diag::err_expected_rbrace);
}
/// ParseEnumSpecifier
/// enum-specifier:
/// enum-specifier: [C99 6.7.2.2]
/// 'enum' identifier[opt] '{' enumerator-list '}'
/// [C99] 'enum' identifier[opt] '{' enumerator-list ',' '}'
/// 'enum' identifier
/// enumerator-list:
/// enumerator
/// enumerator-list , enumerator
/// enumerator-list ',' enumerator
/// enumerator:
/// enumeration-constant
/// enumeration-constant = constant-expression
/// enumeration-constant '=' constant-expression
/// enumeration-constant:
/// identifier
///
@ -306,33 +425,37 @@ void Parser::ParseEnumSpecifier(DeclSpec &DS) {
if (Tok.getKind() == tok::identifier)
ConsumeToken();
if (Tok.getKind() == tok::l_brace) {
SourceLocation LBraceLoc = Tok.getLocation();
ConsumeBrace();
if (Tok.getKind() != tok::l_brace)
return;
SourceLocation LBraceLoc = Tok.getLocation();
ConsumeBrace();
if (Tok.getKind() == tok::r_brace)
Diag(Tok, diag::ext_empty_struct_union_enum, "enum");
// Parse the enumerator-list.
while (Tok.getKind() == tok::identifier) {
ConsumeToken();
// Parse the enumerator-list.
while (Tok.getKind() == tok::identifier) {
if (Tok.getKind() == tok::equal) {
ConsumeToken();
if (Tok.getKind() == tok::equal) {
ConsumeToken();
ExprResult Res = ParseConstantExpression();
if (Res.isInvalid) SkipUntil(tok::comma, true, false);
}
if (Tok.getKind() != tok::comma)
break;
SourceLocation CommaLoc = Tok.getLocation();
ConsumeToken();
if (Tok.getKind() != tok::identifier && !getLang().C99)
Diag(CommaLoc, diag::ext_c99_enumerator_list_comma);
ExprResult Res = ParseConstantExpression();
if (Res.isInvalid) SkipUntil(tok::comma, true, false);
}
// Eat the }.
MatchRHSPunctuation(tok::r_brace, LBraceLoc, "{",
diag::err_expected_rbrace);
if (Tok.getKind() != tok::comma)
break;
SourceLocation CommaLoc = Tok.getLocation();
ConsumeToken();
if (Tok.getKind() != tok::identifier && !getLang().C99)
Diag(CommaLoc, diag::ext_c99_enumerator_list_comma);
}
// Eat the }.
MatchRHSPunctuation(tok::r_brace, LBraceLoc, "{",
diag::err_expected_rbrace);
// TODO: semantic analysis on the declspec for enums.
}

5
clang/include/clang/Basic/DiagnosticKinds.def
View File

@ -236,6 +236,8 @@ DIAG(err_pp_I_dash_not_supported, ERROR,
DIAG(w_type_defaults_to_int, WARNING,
"type defaults to 'int'")
DIAG(w_no_declarators, WARNING,
"declaration does not declare anything")
DIAG(ext_empty_source_file, EXTENSION,
"ISO C forbids an empty source file")
@ -250,6 +252,9 @@ DIAG(ext_integer_complex, EXTENSION,
DIAG(ext_thread_before, EXTENSION,
"'__thread' before 'static'")
DIAG(ext_empty_struct_union_enum, EXTENSION,
"use of empty %s extension")
DIAG(ext_ident_list_in_param, EXTENSION,
"type-less parameter names in function declaration")
DIAG(ext_c99_array_usage, EXTENSION,

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

@ -242,7 +242,10 @@ private:
void ParseDeclaration(unsigned Context);
void ParseInitDeclaratorListAfterFirstDeclarator(Declarator &D);
void ParseDeclarationSpecifiers(DeclSpec &DS);
void ParseSpecifierQualifierList(DeclSpec &DS);
void ParseEnumSpecifier(DeclSpec &DS);
void ParseStructUnionSpecifier(DeclSpec &DS);
bool isDeclarationSpecifier() const;
bool isTypeSpecifierQualifier() const;