[clang][NFC] Convert Parser::ObjCTypeQual to scoped enum

Author: Endilll

clang/include/clang/Parse/Parser.h

@@ -21,6 +21,7 @@
 #include "clang/Sema/SemaCodeCompletion.h"
 #include "clang/Sema/SemaObjC.h"
 #include "clang/Sema/SemaOpenMP.h"
+#include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Frontend/OpenMP/OMPContext.h"
 #include "llvm/Support/SaveAndRestore.h"
@@ -86,6 +87,20 @@ enum class ParsedTemplateKind {
 
 enum class CachedInitKind { DefaultArgument, DefaultInitializer };
 
+// Definitions for Objective-c context sensitive keywords recognition.
+enum class ObjCTypeQual {
+  in = 0,
+  out,
+  inout,
+  oneway,
+  bycopy,
+  byref,
+  nonnull,
+  nullable,
+  null_unspecified,
+  NumQuals
+};
+
 /// Parser - This implements a parser for the C family of languages.  After
 /// parsing units of the grammar, productions are invoked to handle whatever has
 /// been read.
@@ -1818,13 +1833,8 @@ class Parser : public CodeCompletionHandler {
   Decl *ParseObjCPropertyDynamic(SourceLocation atLoc);
 
   IdentifierInfo *ParseObjCSelectorPiece(SourceLocation &MethodLocation);
-  // Definitions for Objective-c context sensitive keywords recognition.
-  enum ObjCTypeQual {
-    objc_in=0, objc_out, objc_inout, objc_oneway, objc_bycopy, objc_byref,
-    objc_nonnull, objc_nullable, objc_null_unspecified,
-    objc_NumQuals
-  };
-  IdentifierInfo *ObjCTypeQuals[objc_NumQuals];
+
+  IdentifierInfo *ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::NumQuals)];
 
   bool isTokIdentifier_in() const;
 

clang/lib/Parse/ParseObjc.cpp

@@ -23,6 +23,7 @@
 #include "clang/Sema/Scope.h"
 #include "clang/Sema/SemaCodeCompletion.h"
 #include "clang/Sema/SemaObjC.h"
+#include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
 
@@ -1176,7 +1177,8 @@ bool Parser::isTokIdentifier_in() const {
   // valid tokens following an 'in'; such as an identifier, unary operators,
   // '[' etc.
   return (getLangOpts().ObjC && Tok.is(tok::identifier) &&
-          Tok.getIdentifierInfo() == ObjCTypeQuals[objc_in]);
+          Tok.getIdentifierInfo() ==
+              ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::in)]);
 }
 
 /// ParseObjCTypeQualifierList - This routine parses the objective-c's type
@@ -1215,34 +1217,47 @@ void Parser::ParseObjCTypeQualifierList(ObjCDeclSpec &DS,
       return;
 
     const IdentifierInfo *II = Tok.getIdentifierInfo();
-    for (unsigned i = 0; i != objc_NumQuals; ++i) {
-      if (II != ObjCTypeQuals[i] ||
-          NextToken().is(tok::less) ||
-          NextToken().is(tok::coloncolon))
+    for (unsigned i = 0; i != llvm::to_underlying(ObjCTypeQual::NumQuals);
+         ++i) {
+      ObjCTypeQual TQ = static_cast<ObjCTypeQual>(i);
+      if (II != ObjCTypeQuals[llvm::to_underlying(TQ)] ||
+          NextToken().is(tok::less) || NextToken().is(tok::coloncolon))
         continue;
 
       ObjCDeclSpec::ObjCDeclQualifier Qual;
       NullabilityKind Nullability;
-      switch (i) {
+      switch (TQ) {
       default: llvm_unreachable("Unknown decl qualifier");
-      case objc_in:     Qual = ObjCDeclSpec::DQ_In; break;
-      case objc_out:    Qual = ObjCDeclSpec::DQ_Out; break;
-      case objc_inout:  Qual = ObjCDeclSpec::DQ_Inout; break;
-      case objc_oneway: Qual = ObjCDeclSpec::DQ_Oneway; break;
-      case objc_bycopy: Qual = ObjCDeclSpec::DQ_Bycopy; break;
-      case objc_byref:  Qual = ObjCDeclSpec::DQ_Byref; break;
-
-      case objc_nonnull:
+      case ObjCTypeQual::in:
+        Qual = ObjCDeclSpec::DQ_In;
+        break;
+      case ObjCTypeQual::out:
+        Qual = ObjCDeclSpec::DQ_Out;
+        break;
+      case ObjCTypeQual::inout:
+        Qual = ObjCDeclSpec::DQ_Inout;
+        break;
+      case ObjCTypeQual::oneway:
+        Qual = ObjCDeclSpec::DQ_Oneway;
+        break;
+      case ObjCTypeQual::bycopy:
+        Qual = ObjCDeclSpec::DQ_Bycopy;
+        break;
+      case ObjCTypeQual::byref:
+        Qual = ObjCDeclSpec::DQ_Byref;
+        break;
+
+      case ObjCTypeQual::nonnull:
         Qual = ObjCDeclSpec::DQ_CSNullability;
         Nullability = NullabilityKind::NonNull;
         break;
 
-      case objc_nullable:
+      case ObjCTypeQual::nullable:
         Qual = ObjCDeclSpec::DQ_CSNullability;
         Nullability = NullabilityKind::Nullable;
         break;
 
-      case objc_null_unspecified:
+      case ObjCTypeQual::null_unspecified:
         Qual = ObjCDeclSpec::DQ_CSNullability;
         Nullability = NullabilityKind::Unspecified;
         break;

clang/lib/Parse/Parser.cpp

@@ -512,16 +512,24 @@ void Parser::Initialize() {
   // Initialization for Objective-C context sensitive keywords recognition.
   // Referenced in Parser::ParseObjCTypeQualifierList.
   if (getLangOpts().ObjC) {
-    ObjCTypeQuals[objc_in] = &PP.getIdentifierTable().get("in");
-    ObjCTypeQuals[objc_out] = &PP.getIdentifierTable().get("out");
-    ObjCTypeQuals[objc_inout] = &PP.getIdentifierTable().get("inout");
-    ObjCTypeQuals[objc_oneway] = &PP.getIdentifierTable().get("oneway");
-    ObjCTypeQuals[objc_bycopy] = &PP.getIdentifierTable().get("bycopy");
-    ObjCTypeQuals[objc_byref] = &PP.getIdentifierTable().get("byref");
-    ObjCTypeQuals[objc_nonnull] = &PP.getIdentifierTable().get("nonnull");
-    ObjCTypeQuals[objc_nullable] = &PP.getIdentifierTable().get("nullable");
-    ObjCTypeQuals[objc_null_unspecified]
-      = &PP.getIdentifierTable().get("null_unspecified");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::in)] =
+        &PP.getIdentifierTable().get("in");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::out)] =
+        &PP.getIdentifierTable().get("out");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::inout)] =
+        &PP.getIdentifierTable().get("inout");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::oneway)] =
+        &PP.getIdentifierTable().get("oneway");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::bycopy)] =
+        &PP.getIdentifierTable().get("bycopy");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::byref)] =
+        &PP.getIdentifierTable().get("byref");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::nonnull)] =
+        &PP.getIdentifierTable().get("nonnull");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::nullable)] =
+        &PP.getIdentifierTable().get("nullable");
+    ObjCTypeQuals[llvm::to_underlying(ObjCTypeQual::null_unspecified)] =
+        &PP.getIdentifierTable().get("null_unspecified");
   }
 
   Ident_instancetype = nullptr;