[ASTMatchers] Re-order the internals to allow another use-case

[steveire]

Summary

Add an operator overload to ArgumentAdaptingMatcherFunc to allow use of
mapAnyOf within hasAncestor, hasParent etc.

[aaron.ballman]

LGTM, though it would have been a bit easier to review had the rearranging been done in a separate NFC patch.

clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp

498–500

Can you also add a test like:

EXPECT_TRUE(notMatches(Code, floatLiteral(hasAncestor(mapAnyOf(ifStmt, forStmt)))));

to show that we can still search all of the nodes and fail.

clang/include/clang/ASTMatchers/ASTMatchersInternal.h

return ArgumentAdaptingMatcherFuncAdaptor<ArgumentAdapterT, T, ToTypes>(
         InnerMatcher);
   }
 
   template <typename T>
   ArgumentAdaptingMatcherFuncAdaptor<ArgumentAdapterT, T, ToTypes>
   operator()(const Matcher<T> &InnerMatcher) const {
     return create(InnerMatcher);
   }
+
+  template <typename... T>
+  ArgumentAdaptingMatcherFuncAdaptor<ArgumentAdapterT,
+                                     typename GetClade<T...>::Type, ToTypes>
+  operator()(const MapAnyOfHelper<T...> &InnerMatcher) const {
+    return create(InnerMatcher.with());
+  }
 };
 
 template <typename T> class TraversalMatcher : public MatcherInterface<T> {
   const DynTypedMatcher InnerMatcher;
   clang::TraversalKind Traversal;
 
 public:
   explicit TraversalMatcher(clang::TraversalKind TK,

clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp

)cpp";
 
   EXPECT_TRUE(matches(
       Code, traverse(TK_IgnoreUnlessSpelledInSource,
                      mapAnyOf(ifStmt, forStmt).with(hasCondition(trueExpr)))));
   EXPECT_TRUE(matches(
       Code, traverse(TK_IgnoreUnlessSpelledInSource,
                      mapAnyOf(ifStmt, forStmt).with(hasCondition(falseExpr)))));
 
+  EXPECT_TRUE(
+      matches(Code, cxxBoolLiteral(equals(true),
+                                   hasAncestor(mapAnyOf(ifStmt, forStmt)))));
+
+  EXPECT_TRUE(
+      matches(Code, cxxBoolLiteral(equals(false),
+                                   hasAncestor(mapAnyOf(ifStmt, forStmt)))));
+
+  EXPECT_TRUE(
+      notMatches(Code, floatLiteral(hasAncestor(mapAnyOf(ifStmt, forStmt)))));
+
   Code = R"cpp(
 void func(bool b) {}
 struct S {
   S(bool b) {}
 };
 void F() {
   func(false);
   S s(true);