Working Argkind enum class

Author: devajithvs

mlir/include/mlir/Query/Matcher/Marshallers.h

@@ -41,7 +41,7 @@ struct ArgTypeTraits<StringRef> {
     return value.getString();
   }
 
-  static ArgKind getKind() { return ArgKind(ArgKind::AK_String); }
+  static ArgKind getKind() { return ArgKind::String; }
 
   static std::optional<std::string> getBestGuess(const VariantValue &) {
     return std::nullopt;
@@ -59,7 +59,7 @@ struct ArgTypeTraits<DynMatcher> {
     return *value.getMatcher().getDynMatcher();
   }
 
-  static ArgKind getKind() { return ArgKind(ArgKind::AK_Matcher); }
+  static ArgKind getKind() { return ArgKind::Matcher; }
 
   static std::optional<std::string> getBestGuess(const VariantValue &) {
     return std::nullopt;

mlir/include/mlir/Query/Matcher/VariantValue.h

@@ -19,22 +19,8 @@
 
 namespace mlir::query::matcher {
 
-// Kind identifier that supports all types that VariantValue can contain.
-class ArgKind {
-public:
-  enum Kind { AK_Matcher, AK_String };
-  ArgKind(Kind k) : k(k) {}
-
-  Kind getArgKind() const { return k; }
-
-  bool operator<(const ArgKind &other) const { return k < other.k; }
-
-  // String representation of the type.
-  std::string asString() const;
-
-private:
-  Kind k;
-};
+// All types that VariantValue can contain.
+enum class ArgKind { Matcher, String };
 
 // A variant matcher object to abstract simple and complex matchers into a
 // single object type.

mlir/lib/Query/Matcher/Registry.cpp

@@ -29,6 +29,17 @@ using IsConstantOp = detail::constant_op_matcher();
 using HasOpAttrName = detail::AttrOpMatcher(StringRef);
 using HasOpName = detail::NameOpMatcher(StringRef);
 
+// Enum to string for autocomplete.
+static std::string asArgString(ArgKind kind) {
+  switch (kind) {
+  case ArgKind::Matcher:
+    return "Matcher";
+  case ArgKind::String:
+    return "String";
+  }
+  llvm_unreachable("Unhandled ArgKind");
+}
+
 class RegistryMaps {
 public:
   RegistryMaps();
@@ -90,7 +101,7 @@ std::vector<ArgKind> Registry::getAcceptedCompletionTypes(
   // Starting with the above seed of acceptable top-level matcher types, compute
   // the acceptable type set for the argument indicated by each context element.
   std::set<ArgKind> typeSet;
-  typeSet.insert(ArgKind(ArgKind::AK_Matcher));
+  typeSet.insert(ArgKind::Matcher);
 
   for (const auto &ctxEntry : context) {
     MatcherCtor ctor = ctxEntry.first;
@@ -119,7 +130,7 @@ Registry::getMatcherCompletions(ArrayRef<ArgKind> acceptedTypes) {
     std::vector<std::vector<ArgKind>> argKinds(numArgs);
 
     for (const ArgKind &kind : acceptedTypes) {
-      if (kind.getArgKind() != kind.AK_Matcher)
+      if (kind != ArgKind::Matcher)
         continue;
 
       for (unsigned arg = 0; arg != numArgs; ++arg)
@@ -143,7 +154,7 @@ Registry::getMatcherCompletions(ArrayRef<ArgKind> acceptedTypes) {
           OS << "|";
 
         firstArgKind = false;
-        OS << argKind.asString();
+        OS << asArgString(argKind);
       }
     }
 
@@ -152,7 +163,7 @@ Registry::getMatcherCompletions(ArrayRef<ArgKind> acceptedTypes) {
 
     if (argKinds.empty())
       typedText += ")";
-    else if (argKinds[0][0].getArgKind() == ArgKind::AK_String)
+    else if (argKinds[0][0] == ArgKind::String)
       typedText += "\"";
 
     completions.emplace_back(typedText, OS.str());

mlir/lib/Query/Matcher/VariantValue.cpp

@@ -13,16 +13,6 @@
 
 namespace mlir::query::matcher {
 
-std::string ArgKind::asString() const {
-  switch (getArgKind()) {
-  case AK_String:
-    return "String";
-  case AK_Matcher:
-    return "Matcher";
-  }
-  llvm_unreachable("Unhandled ArgKind");
-}
-
 VariantMatcher::Payload::~Payload() = default;
 
 class VariantMatcher::SinglePayload : public VariantMatcher::Payload {