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

Remove the last of ClassVirtSpecifiers. 

llvm-svn: 128279
This commit is contained in:
Anders Carlsson 2011-03-25 14:53:29 +00:00
parent f9eb63beb7
commit cafbab7443
4 changed files with 15 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1573,8 +1573,7 @@ private:
VirtSpecifiers::Specifier isCXX0XVirtSpecifier() const;
void ParseOptionalCXX0XVirtSpecifierSeq(VirtSpecifiers &VS);
ClassVirtSpecifiers::Specifier isCXX0XClassVirtSpecifier() const;
void ParseOptionalCXX0XClassVirtSpecifierSeq(ClassVirtSpecifiers &CVS);
bool isCXX0XFinalKeyword() const;
/// DeclaratorScopeObj - RAII object used in Parser::ParseDirectDeclarator to
/// enter a new C++ declarator scope and exit it when the function is

28
clang/include/clang/Sema/DeclSpec.h
View File

@ -1731,34 +1731,6 @@ private:
SourceLocation LastLocation;
};
/// ClassVirtSpecifiers - Represents a C++0x class-virt-specifier-seq.
class ClassVirtSpecifiers {
public:
enum Specifier {
CVS_None = 0,
CVS_Final = 1,
CVS_Explicit = 2
};
ClassVirtSpecifiers() : Specifiers(0) { }
bool SetSpecifier(Specifier CVS, SourceLocation Loc,
const char *&PrevSpec);
bool isFinalSpecified() const { return Specifiers & CVS_Final; }
SourceLocation getFinalLoc() const { return CVS_finalLoc; }
bool isExplicitSpecified() const { return Specifiers & CVS_Explicit; }
SourceLocation getExplicitLoc() const { return CVS_explicitLoc; }
static const char *getSpecifierName(Specifier CVS);
private:
unsigned Specifiers;
SourceLocation CVS_finalLoc, CVS_explicitLoc;
};
} // end namespace clang
#endif

67
clang/lib/Parse/ParseDeclCXX.cpp
View File

@ -823,7 +823,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind,
TUK = Sema::TUK_Reference;
else if (Tok.is(tok::l_brace) ||
(getLang().CPlusPlus && Tok.is(tok::colon)) ||
isCXX0XClassVirtSpecifier() != ClassVirtSpecifiers::CVS_None) {
isCXX0XFinalKeyword()) {
if (DS.isFriendSpecified()) {
// C++ [class.friend]p2:
// A class shall not be defined in a friend declaration.
@ -1008,7 +1008,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind,
if (TUK == Sema::TUK_Definition) {
assert(Tok.is(tok::l_brace) ||
(getLang().CPlusPlus && Tok.is(tok::colon)) ||
isCXX0XClassVirtSpecifier() != ClassVirtSpecifiers::CVS_None);
isCXX0XFinalKeyword());
if (getLang().CPlusPlus)
ParseCXXMemberSpecification(StartLoc, TagType, TagOrTempResult.get());
else
@ -1318,61 +1318,22 @@ void Parser::ParseOptionalCXX0XVirtSpecifierSeq(VirtSpecifiers &VS) {
}
}
/// isCXX0XClassVirtSpecifier - Determine whether the next token is a C++0x
/// class-virt-specifier.
///
/// class-virt-specifier:
/// final
/// explicit
ClassVirtSpecifiers::Specifier Parser::isCXX0XClassVirtSpecifier() const {
/// isCXX0XFinalKeyword - Determine whether the next token is a C++0x
/// contextual 'final' keyword.
bool Parser::isCXX0XFinalKeyword() const {
if (!getLang().CPlusPlus)
return ClassVirtSpecifiers::CVS_None;
return false;
if (Tok.is(tok::kw_explicit))
return ClassVirtSpecifiers::CVS_Explicit;
if (!Tok.is(tok::identifier))
return false;
if (Tok.is(tok::identifier)) {
IdentifierInfo *II = Tok.getIdentifierInfo();
// Initialize the contextual keywords.
if (!Ident_final) {
Ident_final = &PP.getIdentifierTable().get("final");
Ident_override = &PP.getIdentifierTable().get("override");
}
// Initialize the contextual keywords.
if (!Ident_final) {
Ident_final = &PP.getIdentifierTable().get("final");
Ident_override = &PP.getIdentifierTable().get("override");
}
if (II == Ident_final)
return ClassVirtSpecifiers::CVS_Final;
}
return ClassVirtSpecifiers::CVS_None;
}
/// ParseOptionalCXX0XClassVirtSpecifierSeq - Parse a class-virt-specifier-seq.
///
/// class-virt-specifier-seq:
/// class-virt-specifier
/// class-virt-specifier-seq class-virt-specifier
void Parser::ParseOptionalCXX0XClassVirtSpecifierSeq(ClassVirtSpecifiers &CVS) {
while (true) {
ClassVirtSpecifiers::Specifier Specifier = isCXX0XClassVirtSpecifier();
if (Specifier == ClassVirtSpecifiers::CVS_None)
return;
// C++ [class]p1:
// A class-virt-specifier-seq shall contain at most one of each
// class-virt-specifier.
const char *PrevSpec = 0;
if (CVS.SetSpecifier(Specifier, Tok.getLocation(), PrevSpec))
Diag(Tok.getLocation(), diag::err_duplicate_class_virt_specifier)
<< PrevSpec
<< FixItHint::CreateRemoval(Tok.getLocation());
if (!getLang().CPlusPlus0x)
Diag(Tok.getLocation(), diag::ext_override_control_keyword)
<< ClassVirtSpecifiers::getSpecifierName(Specifier);
ConsumeToken();
}
return Tok.getIdentifierInfo() == Ident_final;
}
/// ParseCXXClassMemberDeclaration - Parse a C++ class member declaration.

27
clang/lib/Sema/DeclSpec.cpp
View File

@ -841,30 +841,3 @@ const char *VirtSpecifiers::getSpecifierName(Specifier VS) {
case VS_Final: return "final";
}
}
bool ClassVirtSpecifiers::SetSpecifier(Specifier CVS, SourceLocation Loc,
const char *&PrevSpec) {
if (Specifiers & CVS) {
PrevSpec = getSpecifierName(CVS);
return true;
}
Specifiers |= CVS;
switch (CVS) {
default: assert(0 && "Unknown specifier!");
case CVS_Final: CVS_finalLoc = Loc; break;
case CVS_Explicit: CVS_explicitLoc = Loc; break;
}
return false;
}
const char *ClassVirtSpecifiers::getSpecifierName(Specifier CVS) {
switch (CVS) {
default: assert(0 && "Unknown specifier");
case CVS_Final: return "final";
case CVS_Explicit: return "explicit";
}
}