Cleanup registry

Author: devajithvs

mlir/lib/Tools/mlir-query/Matcher/Diagnostics.cpp

@@ -99,14 +99,8 @@ static llvm::StringRef errorTypeToFormatString(Diagnostics::ErrorType type) {
     return "Incorrect argument count. (Expected = $0) != (Actual = $1)";
   case Diagnostics::ET_RegistryWrongArgType:
     return "Incorrect type for arg $0. (Expected = $1) != (Actual = $2)";
-  case Diagnostics::ET_RegistryNotBindable:
-    return "Matcher does not support binding.";
   case Diagnostics::ET_RegistryValueNotFound:
     return "Value not found: $0";
-  case Diagnostics::ET_RegistryUnknownEnumWithReplace:
-    return "Unknown value '$1' for arg $0; did you mean '$2'";
-  case Diagnostics::ET_RegistryMatcherNoWithSupport:
-    return "Matcher does not support with call.";
 
   case Diagnostics::ET_ParserStringError:
     return "Error parsing string token: <$0>";
@@ -122,20 +116,10 @@ static llvm::StringRef errorTypeToFormatString(Diagnostics::ErrorType type) {
     return "Input value is not a matcher expression.";
   case Diagnostics::ET_ParserInvalidToken:
     return "Invalid token <$0> found when looking for a value.";
-  case Diagnostics::ET_ParserMalformedExprNoOpenParen:
-    return "Malformed identifier expression. Missing '('.";
-  case Diagnostics::ET_ParserMalformedExprNoIdentifier:
-    return "Malformed identifier expression. Missing string identifier.";
-  case Diagnostics::ET_ParserMalformedExprNoCloseParen:
-    return "Malformed identifier expression. Missing ')'.";
   case Diagnostics::ET_ParserTrailingCode:
     return "Unexpected end of code.";
-  case Diagnostics::ET_ParserNumberError:
-    return "Error parsing numeric literal: <$0>";
   case Diagnostics::ET_ParserOverloadedType:
     return "Input value has unresolved overloaded type: $0";
-  case Diagnostics::ET_ParserMalformedChainedExpr:
-    return "Period not followed by valid chained call.";
   case Diagnostics::ET_ParserFailedToBuildMatcher:
     return "Failed to build matcher: $0.";
 

mlir/lib/Tools/mlir-query/Matcher/Diagnostics.h

@@ -48,10 +48,7 @@ class Diagnostics {
     ET_RegistryMatcherNotFound,
     ET_RegistryWrongArgCount,
     ET_RegistryWrongArgType,
-    ET_RegistryNotBindable,
     ET_RegistryValueNotFound,
-    ET_RegistryUnknownEnumWithReplace,
-    ET_RegistryMatcherNoWithSupport,
 
     ET_ParserStringError,
     ET_ParserNoOpenParen,
@@ -60,13 +57,8 @@ class Diagnostics {
     ET_ParserNoCode,
     ET_ParserNotAMatcher,
     ET_ParserInvalidToken,
-    ET_ParserMalformedExprNoOpenParen,
-    ET_ParserMalformedExprNoIdentifier,
-    ET_ParserMalformedExprNoCloseParen,
     ET_ParserTrailingCode,
-    ET_ParserNumberError,
     ET_ParserOverloadedType,
-    ET_ParserMalformedChainedExpr,
     ET_ParserFailedToBuildMatcher
   };
 

mlir/lib/Tools/mlir-query/Matcher/Marshallers.h

@@ -176,10 +176,13 @@ matcherMarshallFixedImpl(void (*func)(), StringRef matcherName,
                          SourceRange nameRange, ArrayRef<ParserValue> args,
                          Diagnostics *error, std::index_sequence<Is...>) {
   using FuncType = ReturnType (*)(ArgTypes...);
+
+  // Check if the argument count matches the expected count
   if (!checkArgCount(nameRange, sizeof...(ArgTypes), args, error)) {
     return VariantMatcher();
   }
 
+  // Check if each argument at the corresponding index has the correct type
   if ((... && checkArgTypeAtIndex<ArgTypes, Is>(matcherName, args, error))) {
     ReturnType fnPointer = reinterpret_cast<FuncType>(func)(
         ArgTypeTraits<ArgTypes>::get(args[Is].value)...);
@@ -205,6 +208,7 @@ template <typename ReturnType, typename... ArgTypes>
 std::unique_ptr<MatcherDescriptor>
 makeMatcherAutoMarshall(ReturnType (*func)(ArgTypes...),
                         StringRef matcherName) {
+  // Create a vector of argument kinds
   std::vector<ArgKind> argKinds = {ArgTypeTraits<ArgTypes>::getKind()...};
   return std::make_unique<FixedArgCountMatcherDescriptor>(
       matcherMarshallFixed<ReturnType, ArgTypes...>,