diff options
author | Alexander Kornienko <alexfh@google.com> | 2020-12-11 00:52:35 +0100 |
---|---|---|
committer | Alexander Kornienko <alexfh@google.com> | 2020-12-11 00:58:46 +0100 |
commit | 027899dab6ac31a34e17b0f43eeb3d00e310a361 (patch) | |
tree | 791dde39680708b5bb74d7c2ba10fa567236ae8f /clang-tools-extra/clang-query | |
parent | 76c36c11a9c620a5eeced5750b844a1097ab7586 (diff) | |
download | llvm-027899dab6ac31a34e17b0f43eeb3d00e310a361.tar.gz |
Remove references to the ast_type_traits namespace
Follow up to cd62511496938e33c061c90796dd23a5288ff843 /
https://reviews.llvm.org/D74499
Reviewed By: aaron.ballman
Differential Revision: https://reviews.llvm.org/D92994
Diffstat (limited to 'clang-tools-extra/clang-query')
-rw-r--r-- | clang-tools-extra/clang-query/Query.h | 2 | ||||
-rw-r--r-- | clang-tools-extra/clang-query/QueryParser.cpp | 11 | ||||
-rw-r--r-- | clang-tools-extra/clang-query/QueryParser.h | 3 | ||||
-rw-r--r-- | clang-tools-extra/clang-query/QuerySession.h | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/clang-tools-extra/clang-query/Query.h b/clang-tools-extra/clang-query/Query.h index 223644fe2e51..4c95195d96c1 100644 --- a/clang-tools-extra/clang-query/Query.h +++ b/clang-tools-extra/clang-query/Query.h @@ -120,7 +120,7 @@ template <> struct SetQueryKind<OutputKind> { static const QueryKind value = QK_SetOutputKind; }; -template <> struct SetQueryKind<ast_type_traits::TraversalKind> { +template <> struct SetQueryKind<TraversalKind> { static const QueryKind value = QK_SetTraversalKind; }; diff --git a/clang-tools-extra/clang-query/QueryParser.cpp b/clang-tools-extra/clang-query/QueryParser.cpp index 45a0d425b7c2..b01d8001b669 100644 --- a/clang-tools-extra/clang-query/QueryParser.cpp +++ b/clang-tools-extra/clang-query/QueryParser.cpp @@ -128,20 +128,17 @@ template <typename QueryType> QueryRef QueryParser::parseSetOutputKind() { llvm_unreachable("Invalid output kind"); } -QueryRef QueryParser::parseSetTraversalKind( - ast_type_traits::TraversalKind QuerySession::*Var) { +QueryRef QueryParser::parseSetTraversalKind(TraversalKind QuerySession::*Var) { StringRef ValStr; unsigned Value = LexOrCompleteWord<unsigned>(this, ValStr) - .Case("AsIs", ast_type_traits::TK_AsIs) - .Case("IgnoreUnlessSpelledInSource", - ast_type_traits::TK_IgnoreUnlessSpelledInSource) + .Case("AsIs", TK_AsIs) + .Case("IgnoreUnlessSpelledInSource", TK_IgnoreUnlessSpelledInSource) .Default(~0u); if (Value == ~0u) { return new InvalidQuery("expected traversal kind, got '" + ValStr + "'"); } - return new SetQuery<ast_type_traits::TraversalKind>( - Var, static_cast<ast_type_traits::TraversalKind>(Value)); + return new SetQuery<TraversalKind>(Var, static_cast<TraversalKind>(Value)); } QueryRef QueryParser::endQuery(QueryRef Q) { diff --git a/clang-tools-extra/clang-query/QueryParser.h b/clang-tools-extra/clang-query/QueryParser.h index 68f420dc0994..ece646024265 100644 --- a/clang-tools-extra/clang-query/QueryParser.h +++ b/clang-tools-extra/clang-query/QueryParser.h @@ -43,8 +43,7 @@ private: template <typename T> struct LexOrCompleteWord; QueryRef parseSetBool(bool QuerySession::*Var); - QueryRef - parseSetTraversalKind(ast_type_traits::TraversalKind QuerySession::*Var); + QueryRef parseSetTraversalKind(TraversalKind QuerySession::*Var); template <typename QueryType> QueryRef parseSetOutputKind(); QueryRef completeMatcherExpression(); diff --git a/clang-tools-extra/clang-query/QuerySession.h b/clang-tools-extra/clang-query/QuerySession.h index 20c788b206a0..31a4900e2619 100644 --- a/clang-tools-extra/clang-query/QuerySession.h +++ b/clang-tools-extra/clang-query/QuerySession.h @@ -26,7 +26,7 @@ public: QuerySession(llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs) : ASTs(ASTs), PrintOutput(false), DiagOutput(true), DetailedASTOutput(false), BindRoot(true), PrintMatcher(false), - Terminate(false), TK(ast_type_traits::TK_AsIs) {} + Terminate(false), TK(TK_AsIs) {} llvm::ArrayRef<std::unique_ptr<ASTUnit>> ASTs; @@ -38,7 +38,7 @@ public: bool PrintMatcher; bool Terminate; - ast_type_traits::TraversalKind TK; + TraversalKind TK; llvm::StringMap<ast_matchers::dynamic::VariantValue> NamedValues; }; |