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

More work on ClassVirtSpecifiers. 

llvm-svn: 124035
This commit is contained in:
Anders Carlsson 2011-01-22 15:58:16 +00:00
parent b53c03be8a
commit f2ca389205
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1480,8 +1480,8 @@ public:
VirtSpecifiers() : Specifiers(0) { }
bool SetVirtSpecifier(VirtSpecifier VS, SourceLocation Loc,
const char *&PrevSpec);
bool SetSpecifier(VirtSpecifier VS, SourceLocation Loc,
const char *&PrevSpec);
bool isOverrideSpecified() const { return Specifiers & VS_Override; }
SourceLocation getOverrideLoc() const { return VS_overrideLoc; }
@ -1512,6 +1512,9 @@ public:
ClassVirtSpecifiers() : Specifiers(0) { }
bool SetSpecifier(ClassVirtSpecifier CVS, SourceLocation Loc,
const char *&PrevSpec);
bool isFinalSpecified() const { return Specifiers & CVS_Final; }
SourceLocation getFinalLoc() const { return CVS_finalLoc; }

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

@ -1308,7 +1308,7 @@ void Parser::ParseOptionalCXX0XVirtSpecifierSeq(VirtSpecifiers &VS) {
// C++ [class.mem]p8:
// A virt-specifier-seq shall contain at most one of each virt-specifier.
const char* PrevSpec = 0;
if (VS.SetVirtSpecifier(Specifier, Tok.getLocation(), PrevSpec))
if (VS.SetSpecifier(Specifier, Tok.getLocation(), PrevSpec))
Diag(Tok.getLocation(), diag::err_duplicate_virt_specifier)
<< PrevSpec
<< FixItHint::CreateRemoval(Tok.getLocation());

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

@ -669,8 +669,8 @@ void UnqualifiedId::setOperatorFunctionId(SourceLocation OperatorLoc,
}
}
bool VirtSpecifiers::SetVirtSpecifier(VirtSpecifier VS, SourceLocation Loc,
const char *&PrevSpec) {
bool VirtSpecifiers::SetSpecifier(VirtSpecifier VS, SourceLocation Loc,
const char *&PrevSpec) {
if (Specifiers & VS) {
PrevSpec = getSpecifierName(VS);
return true;
@ -684,6 +684,7 @@ bool VirtSpecifiers::SetVirtSpecifier(VirtSpecifier VS, SourceLocation Loc,
case VS_Final: VS_finalLoc = Loc; break;
case VS_New: VS_newLoc = Loc; break;
}
return false;
}
@ -695,3 +696,31 @@ const char *VirtSpecifiers::getSpecifierName(VirtSpecifier VS) {
case VS_New: return "new";
}
}
bool ClassVirtSpecifiers::SetSpecifier(ClassVirtSpecifier 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(ClassVirtSpecifier CVS) {
switch (CVS) {
default: assert(0 && "Unknown specifier");
case CVS_Final: return "final";
case CVS_Explicit: return "explicit";
}
}