diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/clang/Tooling/Transformer/RangeSelector.h | 2 | ||||
-rw-r--r-- | include/clang/Tooling/Transformer/RewriteRule.h | 18 | ||||
-rw-r--r-- | include/clang/Tooling/Transformer/Stencil.h | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/include/clang/Tooling/Transformer/RangeSelector.h b/include/clang/Tooling/Transformer/RangeSelector.h index 00f1f84d0f..9f556d2063 100644 --- a/include/clang/Tooling/Transformer/RangeSelector.h +++ b/include/clang/Tooling/Transformer/RangeSelector.h @@ -92,6 +92,8 @@ RangeSelector expansion(RangeSelector S); namespace tooling { // DEPRECATED: These are temporary aliases supporting client migration to the // `transformer` namespace. +using RangeSelector = transformer::RangeSelector; + using transformer::after; using transformer::before; using transformer::callArgs; diff --git a/include/clang/Tooling/Transformer/RewriteRule.h b/include/clang/Tooling/Transformer/RewriteRule.h index 058ef3f23d..6e99151c1c 100644 --- a/include/clang/Tooling/Transformer/RewriteRule.h +++ b/include/clang/Tooling/Transformer/RewriteRule.h @@ -31,11 +31,6 @@ namespace clang { namespace transformer { using TextGenerator = MatchConsumer<std::string>; -/// Wraps a string as a TextGenerator. -inline TextGenerator text(std::string M) { - return [M](const ast_matchers::MatchFinder::MatchResult &) - -> Expected<std::string> { return M; }; -} // Description of a source-code edit, expressed in terms of an AST node. // Includes: an ID for the (bound) node, a selector for source related to the @@ -221,7 +216,9 @@ inline ASTEdit insertAfter(RangeSelector S, TextGenerator Replacement) { /// Removes the source selected by \p S. inline ASTEdit remove(RangeSelector S) { - return change(std::move(S), text("")); + return change(std::move(S), + [](const ast_matchers::MatchFinder::MatchResult &) + -> Expected<std::string> { return ""; }); } /// The following three functions are a low-level part of the RewriteRule @@ -286,6 +283,14 @@ translateEdits(const ast_matchers::MatchFinder::MatchResult &Result, namespace tooling { // DEPRECATED: These are temporary aliases supporting client migration to the // `transformer` namespace. +/// Wraps a string as a TextGenerator. +using TextGenerator = transformer::TextGenerator; + +inline TextGenerator text(std::string M) { + return [M](const ast_matchers::MatchFinder::MatchResult &) + -> Expected<std::string> { return M; }; +} + using transformer::addInclude; using transformer::applyFirst; using transformer::change; @@ -293,7 +298,6 @@ using transformer::insertAfter; using transformer::insertBefore; using transformer::makeRule; using transformer::remove; -using transformer::text; using transformer::RewriteRule; using transformer::IncludeFormat; namespace detail { diff --git a/include/clang/Tooling/Transformer/Stencil.h b/include/clang/Tooling/Transformer/Stencil.h index feb3ac8853..66d1388f97 100644 --- a/include/clang/Tooling/Transformer/Stencil.h +++ b/include/clang/Tooling/Transformer/Stencil.h @@ -195,9 +195,11 @@ StencilPart dPrint(llvm::StringRef Id); } // namespace transformer namespace tooling { -namespace stencil { // DEPRECATED: These are temporary aliases supporting client migration to the // `transformer` namespace. +using Stencil = transformer::Stencil; +using StencilPart = transformer::StencilPart; +namespace stencil { using transformer::access; using transformer::addressOf; using transformer::cat; |