Move internal details to internal namespace

Author: devajithvs

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

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-namespace mlir::query::matcher {
+namespace mlir::query::matcher::internal {
 
 // Represents the line and column numbers in a source query.
 struct SourceLocation {
@@ -114,6 +114,6 @@ class Diagnostics {
   std::vector<ErrorContent> errorValues;
 };
 
-} // namespace mlir::query::matcher
+} // namespace mlir::query::matcher::internal
 
 #endif // MLIR_TOOLS_MLIRQUERY_MATCHER_DIAGNOSTICS_H

mlir/include/mlir/Query/Matcher/Parser.h

@@ -33,7 +33,7 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 
-namespace mlir::query::matcher {
+namespace mlir::query::matcher::internal {
 
 // Matcher expression parser.
 class Parser {
@@ -169,6 +169,6 @@ class Parser {
   std::vector<MatcherCompletion> completions;
 };
 
-} // namespace mlir::query::matcher
+} // namespace mlir::query::matcher::internal
 
 #endif // MLIR_TOOLS_MLIRQUERY_MATCHER_PARSER_H

mlir/include/mlir/Query/Matcher/Registry.h

@@ -56,9 +56,9 @@ class Registry {
   getMatcherCompletions(ArrayRef<ArgKind> acceptedTypes);
 
   static VariantMatcher constructMatcher(MatcherCtor ctor,
-                                         SourceRange nameRange,
+                                         internal::SourceRange nameRange,
                                          ArrayRef<ParserValue> args,
-                                         Diagnostics *error);
+                                         internal::Diagnostics *error);
 };
 
 } // namespace mlir::query::matcher

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

@@ -132,7 +132,7 @@ class VariantValue {
 struct ParserValue {
   ParserValue() {}
   llvm::StringRef text;
-  SourceRange range;
+  internal::SourceRange range;
   VariantValue value;
 };
 

mlir/lib/Query/Matcher/Diagnostics.cpp

@@ -8,7 +8,7 @@
 
 #include "mlir/Query/Matcher/Diagnostics.h"
 
-namespace mlir::query::matcher {
+namespace mlir::query::matcher::internal {
 
 Diagnostics::ArgStream &
 Diagnostics::ArgStream::operator<<(const llvm::Twine &arg) {
@@ -124,4 +124,4 @@ void Diagnostics::print(llvm::raw_ostream &OS) const {
   }
 }
 
-} // namespace mlir::query::matcher
+} // namespace mlir::query::matcher::internal

mlir/lib/Query/Matcher/Parser.cpp

@@ -15,7 +15,7 @@
 #include "llvm/Support/ManagedStatic.h"
 #include <vector>
 
-namespace mlir::query::matcher {
+namespace mlir::query::matcher::internal {
 
 // Simple structure to hold information for one token from the parser.
 struct Parser::TokenInfo {
@@ -556,4 +556,4 @@ Parser::parseMatcherExpression(llvm::StringRef &code, Sema *sema,
   return result;
 }
 
-} // namespace mlir::query::matcher
+} // namespace mlir::query::matcher::internal

mlir/lib/Query/Matcher/Registry.cpp

@@ -162,9 +162,9 @@ Registry::getMatcherCompletions(ArrayRef<ArgKind> acceptedTypes) {
 }
 
 VariantMatcher Registry::constructMatcher(MatcherCtor ctor,
-                                          SourceRange nameRange,
+                                          internal::SourceRange nameRange,
                                           ArrayRef<ParserValue> args,
-                                          Diagnostics *error) {
+                                          internal::Diagnostics *error) {
   return ctor->create(nameRange, args, error);
 }
 

mlir/lib/Query/QueryParser.cpp

@@ -122,7 +122,8 @@ enum ParsedQueryKind {
   PQK_Match,
 };
 
-QueryRef makeInvalidQueryFromDiagnostics(const matcher::Diagnostics &diag) {
+QueryRef
+makeInvalidQueryFromDiagnostics(const matcher::internal::Diagnostics &diag) {
   std::string errStr;
   llvm::raw_string_ostream OS(errStr);
   diag.print(OS);
@@ -132,8 +133,8 @@ QueryRef makeInvalidQueryFromDiagnostics(const matcher::Diagnostics &diag) {
 
 QueryRef QueryParser::completeMatcherExpression() {
   std::vector<matcher::MatcherCompletion> comps =
-      matcher::Parser::completeExpression(line, completionPos - line.begin(),
-                                          nullptr, &QS.namedValues);
+      matcher::internal::Parser::completeExpression(
+          line, completionPos - line.begin(), nullptr, &QS.namedValues);
   for (const auto &comp : comps) {
     completions.emplace_back(comp.typedText, comp.matcherDecl);
   }
@@ -168,12 +169,12 @@ QueryRef QueryParser::doParse() {
       return completeMatcherExpression();
     }
 
-    matcher::Diagnostics diag;
+    matcher::internal::Diagnostics diag;
     auto matcherSource = line.ltrim();
     auto origMatcherSource = matcherSource;
     std::optional<matcher::DynMatcher> matcher =
-        matcher::Parser::parseMatcherExpression(matcherSource, nullptr,
-                                                &QS.namedValues, &diag);
+        matcher::internal::Parser::parseMatcherExpression(
+            matcherSource, nullptr, &QS.namedValues, &diag);
     if (!matcher) {
       return makeInvalidQueryFromDiagnostics(diag);
     }