[NFC] Modernize enums TypeSpecifierWidth, TypeSpecifierSign & TypeSpecifierType into scoped enums.

  

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

7 files changed, 101 insertions, 96 deletions

diff --git a/lib/Sema/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp
index 2fad5a18ba..69266933d6 100644
--- a/lib/Sema/DeclSpec.cpp
+++ b/lib/Sema/DeclSpec.cpp
@@ -324,51 +324,52 @@ bool Declarator::isDeclarationOfFunction() const {
   }
   
   switch (DS.getTypeSpecType()) {
-    case TST_atomic:
-    case TST_auto:
-    case TST_auto_type:
-    case TST_bool:
-    case TST_char:
-    case TST_char16:
-    case TST_char32:
-    case TST_class:
-    case TST_decimal128:
-    case TST_decimal32:
-    case TST_decimal64:
-    case TST_double:
-    case TST_Float16:
-    case TST_float128:
-    case TST_enum:
-    case TST_error:
-    case TST_float:
-    case TST_half:
-    case TST_int:
-    case TST_int128:
-    case TST_struct:
-    case TST_interface:
-    case TST_union:
-    case TST_unknown_anytype:
-    case TST_unspecified:
-    case TST_void:
-    case TST_wchar:
-#define GENERIC_IMAGE_TYPE(ImgType, Id) case TST_##ImgType##_t:
+    case TypeSpecifierType::TST_atomic:
+    case TypeSpecifierType::TST_auto:
+    case TypeSpecifierType::TST_auto_type:
+    case TypeSpecifierType::TST_bool:
+    case TypeSpecifierType::TST_char:
+    case TypeSpecifierType::TST_char16:
+    case TypeSpecifierType::TST_char32:
+    case TypeSpecifierType::TST_class:
+    case TypeSpecifierType::TST_decimal128:
+    case TypeSpecifierType::TST_decimal32:
+    case TypeSpecifierType::TST_decimal64:
+    case TypeSpecifierType::TST_double:
+    case TypeSpecifierType::TST_Float16:
+    case TypeSpecifierType::TST_float128:
+    case TypeSpecifierType::TST_enum:
+    case TypeSpecifierType::TST_error:
+    case TypeSpecifierType::TST_float:
+    case TypeSpecifierType::TST_half:
+    case TypeSpecifierType::TST_int:
+    case TypeSpecifierType::TST_int128:
+    case TypeSpecifierType::TST_struct:
+    case TypeSpecifierType::TST_interface:
+    case TypeSpecifierType::TST_union:
+    case TypeSpecifierType::TST_unknown_anytype:
+    case TypeSpecifierType::TST_unspecified:
+    case TypeSpecifierType::TST_void:
+    case TypeSpecifierType::TST_wchar:
+#define GENERIC_IMAGE_TYPE(ImgType, Id)                                        \
+  case TypeSpecifierType::TST_##ImgType##_t:
 #include "clang/Basic/OpenCLImageTypes.def"
       return false;
 
-    case TST_decltype_auto:
+    case TypeSpecifierType::TST_decltype_auto:
       // This must have an initializer, so can't be a function declaration,
       // even if the initializer has function type.
       return false;
 
-    case TST_decltype:
-    case TST_typeofExpr:
+    case TypeSpecifierType::TST_decltype:
+    case TypeSpecifierType::TST_typeofExpr:
       if (Expr *E = DS.getRepAsExpr())
         return E->getType()->isFunctionType();
       return false;
      
-    case TST_underlyingType:
-    case TST_typename:
-    case TST_typeofType: {
+    case TypeSpecifierType::TST_underlyingType:
+    case TypeSpecifierType::TST_typename:
+    case TypeSpecifierType::TST_typeofType: {
       QualType QT = DS.getRepAsType().get();
       if (QT.isNull())
         return false;
@@ -498,7 +499,8 @@ const char *DeclSpec::getSpecifierName(DeclSpec::TST T,
   case DeclSpec::TST_unspecified: return "unspecified";
   case DeclSpec::TST_void:        return "void";
   case DeclSpec::TST_char:        return "char";
-  case DeclSpec::TST_wchar:       return Policy.MSWChar ? "__wchar_t" : "wchar_t";
+  case DeclSpec::TST_wchar:
+    return Policy.MSWChar ? "__wchar_t" : "wchar_t";
   case DeclSpec::TST_char16:      return "char16_t";
   case DeclSpec::TST_char32:      return "char32_t";
   case DeclSpec::TST_int:         return "int";
diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp
index 2acc896d53..2433cf2d97 100644
--- a/lib/Sema/SemaCodeComplete.cpp
+++ b/lib/Sema/SemaCodeComplete.cpp
@@ -4088,7 +4088,7 @@ void Sema::CodeCompleteObjCClassPropertyRefExpr(Scope *S,
                             Results.data(), Results.size());
 }
 
-void Sema::CodeCompleteTag(Scope *S, unsigned TagSpec) {
+void Sema::CodeCompleteTag(Scope *S, TypeSpecifierType TagSpec) {
   if (!CodeCompleter)
     return;
 
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 743f4bb5e8..b5c990939c 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -12786,11 +12786,11 @@ TypedefDecl *Sema::ParseTypedefDecl(Scope *S, Declarator &D, QualType T,
   //   class type (or enum type) for linkage purposes only.
   // We need to check whether the type was declared in the declaration.
   switch (D.getDeclSpec().getTypeSpecType()) {
-  case TST_enum:
-  case TST_struct:
-  case TST_interface:
-  case TST_union:
-  case TST_class: {
+  case TypeSpecifierType::TST_enum:
+  case TypeSpecifierType::TST_struct:
+  case TypeSpecifierType::TST_interface:
+  case TypeSpecifierType::TST_union:
+  case TypeSpecifierType::TST_class: {
     TagDecl *tagFromDeclSpec = cast<TagDecl>(D.getDeclSpec().getRepAsDecl());
     setTagNameForLinkagePurposes(tagFromDeclSpec, NewTD);
     break;
@@ -13074,7 +13074,7 @@ static bool isAcceptableTagRedeclContext(Sema &S, DeclContext *OldDC,
 ///
 /// \param SkipBody If non-null, will be set to indicate if the caller should
 /// skip the definition of this tag and treat it as if it were a declaration.
-Decl *Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK,
+Decl *Sema::ActOnTag(Scope *S, TypeSpecifierType TagSpec, TagUseKind TUK,
                      SourceLocation KWLoc, CXXScopeSpec &SS,
                      IdentifierInfo *Name, SourceLocation NameLoc,
                      AttributeList *Attr, AccessSpecifier AS,
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index ceded02e39..ca10849194 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -3775,9 +3775,9 @@ Sema::BuildMemInitializer(Decl *ConstructorD,
 
   if (TemplateTypeTy) {
     BaseType = GetTypeFromParser(TemplateTypeTy, &TInfo);
-  } else if (DS.getTypeSpecType() == TST_decltype) {
+  } else if (DS.getTypeSpecType() == TypeSpecifierType::TST_decltype) {
     BaseType = BuildDecltypeType(DS.getRepAsExpr(), DS.getTypeSpecTypeLoc());
-  } else if (DS.getTypeSpecType() == TST_decltype_auto) {
+  } else if (DS.getTypeSpecType() == TypeSpecifierType::TST_decltype_auto) {
     Diag(DS.getTypeSpecTypeLoc(), diag::err_decltype_auto_invalid);
     return true;
   } else {
@@ -13480,11 +13480,10 @@ FriendDecl *Sema::CheckFriendTypeDecl(SourceLocation LocStart,
 /// Handle a friend tag declaration where the scope specifier was
 /// templated.
 Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
-                                    unsigned TagSpec, SourceLocation TagLoc,
-                                    CXXScopeSpec &SS,
+                                    TypeSpecifierType TagSpec,
+                                    SourceLocation TagLoc, CXXScopeSpec &SS,
                                     IdentifierInfo *Name,
-                                    SourceLocation NameLoc,
-                                    AttributeList *Attr,
+                                    SourceLocation NameLoc, AttributeList *Attr,
                                     MultiTemplateParamsArg TempParamLists) {
   TagTypeKind Kind = TypeWithKeyword::getTagTypeKindForTypeSpec(TagSpec);
 
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 7c6af5793f..9cc19672ef 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -1152,7 +1152,7 @@ static void SetNestedNameSpecifier(TagDecl *T, const CXXScopeSpec &SS) {
 }
 
 DeclResult
-Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK,
+Sema::CheckClassTemplate(Scope *S, TypeSpecifierType TagSpec, TagUseKind TUK,
                          SourceLocation KWLoc, CXXScopeSpec &SS,
                          IdentifierInfo *Name, SourceLocation NameLoc,
                          AttributeList *Attr,
@@ -7336,7 +7336,7 @@ bool Sema::CheckTemplatePartialSpecializationArgs(
 }
 
 DeclResult
-Sema::ActOnClassTemplateSpecialization(Scope *S, unsigned TagSpec,
+Sema::ActOnClassTemplateSpecialization(Scope *S, TypeSpecifierType TagSpec,
                                        TagUseKind TUK,
                                        SourceLocation KWLoc,
                                        SourceLocation ModulePrivateLoc,
@@ -8506,7 +8506,7 @@ DeclResult
 Sema::ActOnExplicitInstantiation(Scope *S,
                                  SourceLocation ExternLoc,
                                  SourceLocation TemplateLoc,
-                                 unsigned TagSpec,
+                                 TypeSpecifierType TagSpec,
                                  SourceLocation KWLoc,
                                  const CXXScopeSpec &SS,
                                  TemplateTy TemplateD,
@@ -8794,7 +8794,7 @@ DeclResult
 Sema::ActOnExplicitInstantiation(Scope *S,
                                  SourceLocation ExternLoc,
                                  SourceLocation TemplateLoc,
-                                 unsigned TagSpec,
+                                 TypeSpecifierType TagSpec,
                                  SourceLocation KWLoc,
                                  CXXScopeSpec &SS,
                                  IdentifierInfo *Name,
@@ -9310,7 +9310,7 @@ DeclResult Sema::ActOnExplicitInstantiation(Scope *S,
 }
 
 TypeResult
-Sema::ActOnDependentTag(Scope *S, unsigned TagSpec, TagUseKind TUK,
+Sema::ActOnDependentTag(Scope *S, TypeSpecifierType TagSpec, TagUseKind TUK,
                         const CXXScopeSpec &SS, IdentifierInfo *Name,
                         SourceLocation TagLoc, SourceLocation NameLoc) {
   // This has to hold, because SS is expected to be defined.
diff --git a/lib/Sema/SemaTemplateVariadic.cpp b/lib/Sema/SemaTemplateVariadic.cpp
index d81837dad5..7acdad5572 100644
--- a/lib/Sema/SemaTemplateVariadic.cpp
+++ b/lib/Sema/SemaTemplateVariadic.cpp
@@ -791,52 +791,53 @@ Optional<unsigned> Sema::getNumArgumentsInExpansion(QualType T,
 bool Sema::containsUnexpandedParameterPacks(Declarator &D) {
   const DeclSpec &DS = D.getDeclSpec();
   switch (DS.getTypeSpecType()) {
-  case TST_typename:
-  case TST_typeofType:
-  case TST_underlyingType:
-  case TST_atomic: {
+  case TypeSpecifierType::TST_typename:
+  case TypeSpecifierType::TST_typeofType:
+  case TypeSpecifierType::TST_underlyingType:
+  case TypeSpecifierType::TST_atomic: {
     QualType T = DS.getRepAsType().get();
     if (!T.isNull() && T->containsUnexpandedParameterPack())
       return true;
     break;
   }
       
-  case TST_typeofExpr:
-  case TST_decltype:
+  case TypeSpecifierType::TST_typeofExpr:
+  case TypeSpecifierType::TST_decltype:
     if (DS.getRepAsExpr() && 
         DS.getRepAsExpr()->containsUnexpandedParameterPack())
       return true;
     break;
       
-  case TST_unspecified:
-  case TST_void:
-  case TST_char:
-  case TST_wchar:
-  case TST_char16:
-  case TST_char32:
-  case TST_int:
-  case TST_int128:
-  case TST_half:
-  case TST_float:
-  case TST_double:
-  case TST_Float16:
-  case TST_float128:
-  case TST_bool:
-  case TST_decimal32:
-  case TST_decimal64:
-  case TST_decimal128:
-  case TST_enum:
-  case TST_union:
-  case TST_struct:
-  case TST_interface:
-  case TST_class:
-  case TST_auto:
-  case TST_auto_type:
-  case TST_decltype_auto:
-#define GENERIC_IMAGE_TYPE(ImgType, Id) case TST_##ImgType##_t:
+  case TypeSpecifierType::TST_unspecified:
+  case TypeSpecifierType::TST_void:
+  case TypeSpecifierType::TST_char:
+  case TypeSpecifierType::TST_wchar:
+  case TypeSpecifierType::TST_char16:
+  case TypeSpecifierType::TST_char32:
+  case TypeSpecifierType::TST_int:
+  case TypeSpecifierType::TST_int128:
+  case TypeSpecifierType::TST_half:
+  case TypeSpecifierType::TST_float:
+  case TypeSpecifierType::TST_double:
+  case TypeSpecifierType::TST_Float16:
+  case TypeSpecifierType::TST_float128:
+  case TypeSpecifierType::TST_bool:
+  case TypeSpecifierType::TST_decimal32:
+  case TypeSpecifierType::TST_decimal64:
+  case TypeSpecifierType::TST_decimal128:
+  case TypeSpecifierType::TST_enum:
+  case TypeSpecifierType::TST_union:
+  case TypeSpecifierType::TST_struct:
+  case TypeSpecifierType::TST_interface:
+  case TypeSpecifierType::TST_class:
+  case TypeSpecifierType::TST_auto:
+  case TypeSpecifierType::TST_auto_type:
+  case TypeSpecifierType::TST_decltype_auto:
+#define GENERIC_IMAGE_TYPE(ImgType, Id)                                        \
+  case TypeSpecifierType::TST_##ImgType##_t:
 #include "clang/Basic/OpenCLImageTypes.def"
-  case TST_unknown_anytype:
-  case TST_error:
+  case TypeSpecifierType::TST_unknown_anytype:
+  case TypeSpecifierType::TST_error:
     break;
   }
 
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 4dab52a9f5..160bd146e5 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -1433,8 +1433,10 @@ static QualType ConvertDeclSpecToType(TypeProcessingState &state) {
     // If the type is deprecated or unavailable, diagnose it.
     S.DiagnoseUseOfDecl(D, DS.getTypeSpecTypeNameLoc());
 
-    assert(DS.getTypeSpecWidth() == 0 && DS.getTypeSpecComplex() == 0 &&
-           DS.getTypeSpecSign() == 0 && "No qualifiers on tag names!");
+    assert(DS.getTypeSpecWidth() == TypeSpecifierWidth::TSW_unspecified &&
+           DS.getTypeSpecComplex() == 0 &&
+           DS.getTypeSpecSign() == TypeSpecifierSign::TSS_unspecified &&
+           "No qualifiers on tag names!");
 
     // TypeQuals handled by caller.
     Result = Context.getTypeDeclType(D);
@@ -1446,8 +1448,9 @@ static QualType ConvertDeclSpecToType(TypeProcessingState &state) {
     break;
   }
   case DeclSpec::TST_typename: {
-    assert(DS.getTypeSpecWidth() == 0 && DS.getTypeSpecComplex() == 0 &&
-           DS.getTypeSpecSign() == 0 &&
+    assert(DS.getTypeSpecWidth() == TypeSpecifierWidth::TSW_unspecified &&
+           DS.getTypeSpecComplex() == 0 &&
+           DS.getTypeSpecSign() == TypeSpecifierSign::TSS_unspecified &&
            "Can't handle qualifiers on typedef names yet!");
     Result = S.GetTypeFromParser(DS.getRepAsType());
     if (Result.isNull()) {
@@ -5308,16 +5311,16 @@ namespace {
         // Set info for the written builtin specifiers.
         TL.getWrittenBuiltinSpecs() = DS.getWrittenBuiltinSpecs();
         // Try to have a meaningful source location.
-        if (TL.getWrittenSignSpec() != TSS_unspecified)
+        if (TL.getWrittenSignSpec() != TypeSpecifierSign::TSS_unspecified)
           TL.expandBuiltinRange(DS.getTypeSpecSignLoc());
-        if (TL.getWrittenWidthSpec() != TSW_unspecified)
+        if (TL.getWrittenWidthSpec() != TypeSpecifierWidth::TSW_unspecified)
           TL.expandBuiltinRange(DS.getTypeSpecWidthRange());
       }
     }
     void VisitElaboratedTypeLoc(ElaboratedTypeLoc TL) {
       ElaboratedTypeKeyword Keyword
         = TypeWithKeyword::getKeywordForTypeSpec(DS.getTypeSpecType());
-      if (DS.getTypeSpecType() == TST_typename) {
+      if (DS.getTypeSpecType() == TypeSpecifierType::TST_typename) {
         TypeSourceInfo *TInfo = nullptr;
         Sema::GetTypeFromParser(DS.getRepAsType(), &TInfo);
         if (TInfo) {
@@ -5333,7 +5336,7 @@ namespace {
       Visit(TL.getNextTypeLoc().getUnqualifiedLoc());
     }
     void VisitDependentNameTypeLoc(DependentNameTypeLoc TL) {
-      assert(DS.getTypeSpecType() == TST_typename);
+      assert(DS.getTypeSpecType() == TypeSpecifierType::TST_typename);
       TypeSourceInfo *TInfo = nullptr;
       Sema::GetTypeFromParser(DS.getRepAsType(), &TInfo);
       assert(TInfo);
@@ -5341,7 +5344,7 @@ namespace {
     }
     void VisitDependentTemplateSpecializationTypeLoc(
                                  DependentTemplateSpecializationTypeLoc TL) {
-      assert(DS.getTypeSpecType() == TST_typename);
+      assert(DS.getTypeSpecType() == TypeSpecifierType::TST_typename);
       TypeSourceInfo *TInfo = nullptr;
       Sema::GetTypeFromParser(DS.getRepAsType(), &TInfo);
       assert(TInfo);