Prepend all matcher files names for easy identification

Author: devajithvs

mlir/lib/Tools/mlir-query/CMakeLists.txt

@@ -7,10 +7,10 @@ add_mlir_library(MLIRQueryLib
   MlirQueryMain.cpp
   Query.cpp
   QueryParser.cpp
-  Parser.cpp
-  Registry.cpp
-  VariantValue.cpp
-  Diagnostics.cpp
+  MatcherParser.cpp
+  MatcherRegistry.cpp
+  MatcherVariantValue.cpp
+  MatcherDiagnostics.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Tools/mlir-query

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

@@ -19,7 +19,7 @@
 #define MLIR_TOOLS_MLIRQUERY_MATCHERS_MARSHALLERS_H
 
 #include "MatchersInternal.h"
-#include "VariantValue.h"
+#include "MatcherVariantValue.h"
 #include "mlir/IR/Matchers.h"
 #include "llvm/Support/type_traits.h"
 

mlir/lib/Tools/mlir-query/Diagnostics.cpp renamed to mlir/lib/Tools/mlir-query/MatcherDiagnostics.cpp

@@ -1,12 +1,12 @@
-//===- Diagnostic.cpp -----------------------------------------------------===//
+//===- MatcherDiagnostic.cpp ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "Diagnostics.h"
+#include "MatcherDiagnostics.h"
 
 #include "llvm/Support/Debug.h"
 using llvm::dbgs;

mlir/lib/Tools/mlir-query/Diagnostics.h renamed to mlir/lib/Tools/mlir-query/MatcherDiagnostics.h

@@ -1,4 +1,4 @@
-//===--- Diagnostics.h - Helper class for error diagnostics ---------------===//
+//===--- MatcherDiagnostics.h - Helper class for error diagnostics --------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,10 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_DIAGNOSTICS_H
-#define MLIR_TOOLS_MLIRQUERY_MATCHERS_DIAGNOSTICS_H
+#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERDIAGNOSTICS_H
+#define MLIR_TOOLS_MLIRQUERY_MATCHERDIAGNOSTICS_H
 
-#include "VariantValue.h"
+#include "MatcherVariantValue.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
@@ -177,4 +177,4 @@ class Diagnostics {
 } // namespace query
 } // namespace mlir
 
-#endif // MLIR_TOOLS_MLIRQUERY_MATCHERS_DIAGNOSTICS_H
+#endif // MLIR_TOOLS_MLIRQUERY_MATCHERDIAGNOSTICS_H

mlir/lib/Tools/mlir-query/Parser.cpp renamed to mlir/lib/Tools/mlir-query/MatcherParser.cpp

@@ -1,4 +1,4 @@
-//===- Parser.cpp - Matcher expression parser -----------------------------===//
+//===- MatcherParser.cpp - Matcher expression parser ----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Parser.h"
-#include "Registry.h"
+#include "MatcherParser.h"
+#include "MatcherRegistry.h"
 #include "llvm/ADT/Twine.h"
 #include <string>
 #include <vector>

mlir/lib/Tools/mlir-query/Parser.h renamed to mlir/lib/Tools/mlir-query/MatcherParser.h

@@ -1,4 +1,4 @@
-//===--- Parser.h - Matcher expression parser -----------------------------===//
+//===--- MatcherParser.h - Matcher expression parser ----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -23,11 +23,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_PARSER_H
-#define MLIR_TOOLS_MLIRQUERY_MATCHERS_PARSER_H
+#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERPARSER_H
+#define MLIR_TOOLS_MLIRQUERY_MATCHERPARSER_H
 
-#include "Diagnostics.h"
-#include "VariantValue.h"
+#include "MatcherDiagnostics.h"
+#include "MatcherVariantValue.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 
@@ -126,4 +126,4 @@ class Parser {
 } // namespace query
 } // namespace mlir
 
-#endif // MLIR_TOOLS_MLIRQUERY_MATCHERS_PARSER_H
+#endif // MLIR_TOOLS_MLIRQUERY_MATCHERPARSER_H

mlir/lib/Tools/mlir-query/Registry.cpp renamed to mlir/lib/Tools/mlir-query/MatcherRegistry.cpp

@@ -1,4 +1,4 @@
-//===- Registry.cpp - Matcher registry ------------------------------------===//
+//===- MatcherRegistry.cpp - Matcher registry -----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Registry.h"
+#include "MatcherRegistry.h"
 #include "ExtraMatchers.h"
 #include "mlir/IR/Matchers.h"
 #include "llvm/ADT/StringMap.h"

mlir/lib/Tools/mlir-query/Registry.h renamed to mlir/lib/Tools/mlir-query/MatcherRegistry.h

@@ -1,4 +1,4 @@
-//===--- Registry.h - Matcher registry ------------------------------------===//
+//===--- MatcherRegistry.h - Matcher registry -----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,12 +12,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_REGISTRY_H
-#define MLIR_TOOLS_MLIRQUERY_MATCHERS_REGISTRY_H
+#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERREGISTRY_H
+#define MLIR_TOOLS_MLIRQUERY_MATCHERREGISTRY_H
 
-#include "Diagnostics.h"
+#include "MatcherDiagnostics.h"
 #include "Marshallers.h"
-#include "VariantValue.h"
+#include "MatcherVariantValue.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 
@@ -55,4 +55,4 @@ class Registry {
 } // namespace query
 } // namespace mlir
 
-#endif // MLIR_TOOLS_MLIRQUERY_MATCHERS_REGISTRY_H
+#endif // MLIR_TOOLS_MLIRQUERY_MATCHERREGISTRY_H

mlir/lib/Tools/mlir-query/MLIRTypeTraits.h renamed to mlir/lib/Tools/mlir-query/MatcherTypeTraits.h

@@ -1,4 +1,4 @@
-//===--- MLIRTypeTraits.h -------------------------------------------------===//
+//===--- MatcherTypeTraits.h ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_MLIRTYPETRAITS_H
-#define MLIR_TOOLS_MLIRQUERY_MATCHERS_MLIRTYPETRAITS_H
+#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_MatcherTYPETRAITS_H
+#define MLIR_TOOLS_MLIRQUERY_MATCHERS_MatcherTYPETRAITS_H
 
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OpDefinition.h"
@@ -150,4 +150,4 @@ struct DynTypedNode::BaseConverter<Value, void> : public ValueConverter<Value> {
 } // namespace query
 } // namespace mlir
 
-#endif // MLIR_TOOLS_MLIRQUERY_MATCHERS_MLIRTYPETRAITS_H
+#endif // MLIR_TOOLS_MLIRQUERY_MATCHERS_MatcherTYPETRAITS_H

mlir/lib/Tools/mlir-query/VariantValue.cpp renamed to mlir/lib/Tools/mlir-query/MatcherVariantValue.cpp

@@ -1,4 +1,4 @@
-//===--- VariantValue.cpp - Polymorphic value type ------------------------===//
+//===--- MatcherVariantValue.cpp - Polymorphic value type -----------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "VariantValue.h"
+#include "MatcherVariantValue.h"
 
 namespace mlir {
 namespace query {

mlir/lib/Tools/mlir-query/VariantValue.h renamed to mlir/lib/Tools/mlir-query/MatcherVariantValue.h

@@ -1,4 +1,4 @@
-//===--- VariantValue.h - Polymorphic value type --------------------------===//
+//===--- MatcherVariantValue.h - Polymorphic value type -------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_VARIANTVALUE_H
-#define MLIR_TOOLS_MLIRQUERY_MATCHERS_VARIANTVALUE_H
+#ifndef MLIR_TOOLS_MLIRQUERY_MATCHERVARIANTVALUE_H
+#define MLIR_TOOLS_MLIRQUERY_MATCHERVARIANTVALUE_H
 
 #include "MatchersInternal.h"
 #include "mlir/IR/Matchers.h"
@@ -121,4 +121,4 @@ class VariantValue {
 } // end namespace query
 } // end namespace mlir
 
-#endif // MLIR_TOOLS_MLIRQUERY_MATCHERS_VARIANTVALUE_H
+#endif // MLIR_TOOLS_MLIRQUERY_MATCHERVARIANTVALUE_H

mlir/lib/Tools/mlir-query/MatchersInternal.h

@@ -25,7 +25,7 @@
 #ifndef MLIR_TOOLS_MLIRQUERY_MATCHERS_MATCHERSINTERNAL_H
 #define MLIR_TOOLS_MLIRQUERY_MATCHERS_MATCHERSINTERNAL_H
 
-#include "MLIRTypeTraits.h"
+#include "MatcherTypeTraits.h"
 #include "mlir/IR/Matchers.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 

mlir/lib/Tools/mlir-query/Query.h

@@ -9,7 +9,7 @@
 #ifndef MLIR_TOOLS_MLIRQUERY_QUERY_H
 #define MLIR_TOOLS_MLIRQUERY_QUERY_H
 
-#include "Parser.h"
+#include "MatcherParser.h"
 #include "mlir/IR/Matchers.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/Twine.h"