More work on ClassVirtSpecifiers.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124035 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Sema/DeclSpec.h b/include/clang/Sema/DeclSpec.h
index 7d5b8b41c8fc0a91ca48577d4d063e5467a5e9f0..d984ba2c54ccb73d8b722b0ddc0437635113d4e9 100644 (file)
--- a/include/clang/Sema/DeclSpec.h
+++ b/include/clang/Sema/DeclSpec.h
@@ -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; }
 

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 998a4976d2b5939834c191dd340ad0d5f33c675b..5ce4d1f00eeb31c3f17094f6c449469ab438a4b2 100644 (file)
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -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());

diff --git a/lib/Sema/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp
index 3facfac7a39115c2d8bd086b3cef5191222d2dad..8fbcc7ba43eed33013161d6107cfadc5bbf399d3 100644 (file)
--- a/lib/Sema/DeclSpec.cpp
+++ b/lib/Sema/DeclSpec.cpp
@@ -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";
+  }
+}
+