Unexpose diagnostics functions

Author: devajithvs

mlir/include/mlir/Query/Matcher/Diagnostics.h

@@ -38,9 +38,6 @@ struct SourceRange {
 // Diagnostics class to manage error messages.
 class Diagnostics {
 public:
-  // Parser context types.
-  enum ContextType { CT_MatcherArg, CT_MatcherConstruct };
-
   // All errors from the system.
   enum ErrorType {
     ET_None,
@@ -92,6 +89,22 @@ class Diagnostics {
     Diagnostics *const error;
   };
 
+  // Add an error message with the specified range and error type.
+  // Returns an ArgStream object to allow constructing the error message using
+  // the << operator.
+  ArgStream addError(SourceRange range, ErrorType error);
+
+  // Print all error messages to the specified output stream.
+  void print(llvm::raw_ostream &OS) const;
+
+  // Print the full error messages, including the context information, to the
+  // specified output stream.
+  void printFull(llvm::raw_ostream &OS) const;
+
+private:
+  // Parser context types.
+  enum ContextType { CT_MatcherArg, CT_MatcherConstruct };
+
   // Context for managing overloaded matcher construction.
   struct OverloadContext {
     // Construct an overload context with the given error.
@@ -105,11 +118,6 @@ class Diagnostics {
     unsigned beginIndex{};
   };
 
-  // Add an error message with the specified range and error type.
-  // Returns an ArgStream object to allow constructing the error message using
-  // the << operator.
-  ArgStream addError(SourceRange range, ErrorType error);
-
   // Information stored for one frame of the context.
   struct ContextFrame {
     ContextType type;
@@ -131,14 +139,18 @@ class Diagnostics {
   // Get an array reference to the error contents.
   llvm::ArrayRef<ErrorContent> errors() const { return errorValues; }
 
-  // Print all error messages to the specified output stream.
-  void print(llvm::raw_ostream &OS) const;
+  llvm::StringRef contextTypeToFormatString(ContextType type) const;
 
-  // Print the full error messages, including the context information, to the
-  // specified output stream.
-  void printFull(llvm::raw_ostream &OS) const;
+  void printContextFrameToStream(const ContextFrame &frame,
+                                 llvm::raw_ostream &OS) const;
+
+  void printMessageToStream(const ErrorContent::Message &message,
+                            const llvm::Twine Prefix,
+                            llvm::raw_ostream &OS) const;
+
+  void printErrorContentToStream(const ErrorContent &content,
+                                 llvm::raw_ostream &OS) const;
 
-private:
   // Push a new context frame onto the context stack with the specified type and
   // range.
   ArgStream pushContextFrame(ContextType type, SourceRange range);

mlir/include/mlir/Query/Matcher/MatchFinder.h

@@ -39,4 +39,4 @@ class MatchFinder {
 
 } // namespace mlir::query::matcher
 
-#endif // MLIR_TOOLS_MLIRQUERY_MATCHER_MATCHERFINDER_H
+#endif // MLIR_TOOLS_MLIRQUERY_MATCHER_MATCHERFINDER_H

mlir/lib/Query/Matcher/Diagnostics.cpp

@@ -72,8 +72,8 @@ Diagnostics::ArgStream Diagnostics::addError(SourceRange range,
   return ArgStream(&last.messages.back().args);
 }
 
-static llvm::StringRef
-contextTypeToFormatString(Diagnostics::ContextType type) {
+llvm::StringRef
+Diagnostics::contextTypeToFormatString(Diagnostics::ContextType type) const {
   switch (type) {
   case Diagnostics::CT_MatcherConstruct:
     return "Error building matcher $0.";
@@ -150,22 +150,22 @@ static void maybeAddLineAndColumn(SourceRange range, llvm::raw_ostream &OS) {
   }
 }
 
-static void printContextFrameToStream(const Diagnostics::ContextFrame &frame,
-                                      llvm::raw_ostream &OS) {
+void Diagnostics::printContextFrameToStream(
+    const Diagnostics::ContextFrame &frame, llvm::raw_ostream &OS) const {
   maybeAddLineAndColumn(frame.range, OS);
   formatErrorString(contextTypeToFormatString(frame.type), frame.args, OS);
 }
 
-static void
-printMessageToStream(const Diagnostics::ErrorContent::Message &message,
-                     const llvm::Twine Prefix, llvm::raw_ostream &OS) {
+void Diagnostics::printMessageToStream(
+    const Diagnostics::ErrorContent::Message &message, const llvm::Twine Prefix,
+    llvm::raw_ostream &OS) const {
   maybeAddLineAndColumn(message.range, OS);
   OS << Prefix;
   formatErrorString(errorTypeToFormatString(message.type), message.args, OS);
 }
 
-static void printErrorContentToStream(const Diagnostics::ErrorContent &content,
-                                      llvm::raw_ostream &OS) {
+void Diagnostics::printErrorContentToStream(
+    const Diagnostics::ErrorContent &content, llvm::raw_ostream &OS) const {
   if (content.messages.size() == 1) {
     printMessageToStream(content.messages[0], "", OS);
   } else {