Showing off the small emails

[klimek]

Summary

Feel free to comment - in the comment emails, make sure you select everything you want included in the context. Try selecting "old" and "new" code

[chandlerc]

include/clang/ASTMatchers/ASTMatchers.h

78–83

Hmmm

131–134

curious what this will do

134–137

Can't seem to select the old side and the new side...

include/clang/ASTMatchers/ASTMatchersInternal.h

600–602

An edit!

[klimek]

include/clang/ASTMatchers/ASTMatchersInternal.h

600–602

Let's see whether you like that better...

[klimek]

include/clang/ASTMatchers/ASTMatchers.h

131–134

Me too.

[chandlerc]

include/clang/ASTMatchers/ASTMatchers.h

77–79

More added, but commented on old...

135–144

Some added stuff

include/clang/ASTMatchers/ASTMatchersInternal.h

744–748

Bad bad deleted stuff!

[chandlerc]

Lets see what a preface comment looks like in conjunction with an inline comment.

include/clang/ASTMatchers/ASTMatchersInternal.h

744–756

And if I select all of the deleted, I should get the added too? Even on the old side?

[chandlerc]

Lets see what a preface comment looks like in conjunction with an inline comment.

include/clang/ASTMatchers/ASTMatchersInternal.h

600–602

Replies are interesting!

744–756

What does it look like when replying inline?

[chandlerc]

Suggested ASCII art form:

http://pastie.org/4462496

Lets see what a preface comment looks like in conjunction with an inline
comment.

Comment at: include/clang/ASTMatchers/ASTMatchersInternal.h:744-756

@@ -743,15 +761,6 @@
BindableMatcher<T> makeDynCastAllOfComposite(

ArrayRef<const Matcher<InnerT> *> InnerMatchers) {

• if (InnerMatchers.empty()) {
• Matcher<InnerT> InnerMatcher = makeMatcher(new TrueMatcher<InnerT>);
• return BindableMatcher<T>(new DynCastMatcher<T, InnerT>(InnerMatcher));
• }
• Matcher<InnerT> InnerMatcher = *InnerMatchers.back();
• for (int i = InnerMatchers.size() - 2; i >= 0; --i) {
• InnerMatcher = makeMatcher(
• new AllOfMatcher<InnerT, Matcher<InnerT>, Matcher<InnerT> >(
• *InnerMatchers[i], InnerMatcher));
• }
• return BindableMatcher<T>(new DynCastMatcher<T, InnerT>(InnerMatcher));

+ return BindableMatcher<T>(new DynCastMatcher<T, InnerT>(
+ makeAllOfComposite(InnerMatchers)));

}

What does it look like when replying inline?

Comment at: include/clang/ASTMatchers/ASTMatchersInternal.h:600-602

@@ -599,5 +599,5 @@
class BindableMatcher : public Matcher<T> {
public:

• BindableMatcher(MatcherInterface<T> *Implementation)

+ explicit BindableMatcher(MatcherInterface<T> *Implementation)

: Matcher<T>(Implementation) {}

--------------------------------------------------------------------------

Replies are interesting!

[klimek]

include/clang/ASTMatchers/ASTMatchersInternal.h

744–752

Better?

[klimek]

And top

include/clang/ASTMatchers/ASTMatchersInternal.h

604–737

Multiple...

895–898

Comments...

[chandlerc]

ASCII art looks awesome to me...

[klimek]

include/clang/ASTMatchers/ASTMatchers.h

131–134

Replying to myself :P

include/clang/ASTMatchers/ASTMatchersInternal.h

600–602

And now hopefully work.

[chandlerc]

I bow before you sir.

[klimek]

test

[klimek]

include/clang/ASTMatchers/ASTMatchersInternal.h

607

Testing email stuff.

[klimek]

hrm

[klimek]

doesn't work yet... :(

[klimek]

test

[klimek]

test2

[djasper]

Yet another comment to test the Phab-mailing.

[klimek]

test42

include/clang/ASTMatchers/ASTMatchers.h

   const T *getStmtAs(StringRef ID) const {
     return getNodeAs<T>(StmtBindings, ID);
   }
+  QualType *getType(StringRef ID) const {
+
+  }
   /// @}
 
 private:  return internal::PolymorphicMatcherWithParam0<internal::TrueMatcher>();

 }
 
 /// \brief Matches types.
+///
+/// Examples matches TODO
+/// \code
+/// TODO
+/// \endcode
+const internal::VariadicNodeMatcher<QualType> type;
+
+/// \brief Matches declarations.
 ///
 /// Examples matches \c X, \c C, and the friend declaration inside \c C;
 

include/clang/ASTMatchers/ASTMatchersInternal.h

 template <typename T>
 class BindableMatcher : public Matcher<T> {
 public:
-  BindableMatcher(MatcherInterface<T> *Implementation)
+  explicit BindableMatcher(MatcherInterface<T> *Implementation)
     : Matcher<T>(Implementation) {}
 
+  explicit BindableMatcher(const Matcher<T> &Other)
+    : Matcher<T>(Other) {}
+
   /// \brief Returns a matcher that will bind the matched node on a match.
   ///
   /// The returned matcher is equivalent to this matcher, but will  const Matcher<T> InnertMatcher2;

 };
 
 template<typename T>
+BindableMatcher<T> makeAllOfComposite(
+    ArrayRef<const Matcher<T> *> Matchers) {
+  if (Matchers.empty()) {
+    return BindableMatcher<T>(new TrueMatcher<T>);
+  }
+  Matcher<T> Combined = *Matchers.back();
+  for (int i = Matchers.size() - 2; i >= 0; --i) {
+    Combined = makeMatcher(
+      new AllOfMatcher<T, Matcher<T>, Matcher<T> >(
+        *Matchers[i], Combined));
+  }
+  return BindableMatcher<T>(Combined);
+}
+
+/// \brief Creates a Matcher<T> that matches if
 /// T is dyn_cast'able into InnerT and all inner matchers match.
 ///template<typename T, typename InnerT>
 BindableMatcher<T> makeDynCastAllOfComposite(

     ArrayRef<const Matcher<InnerT> *> InnerMatchers) {
   return BindableMatcher<T>(new DynCastMatcher<T, InnerT>(
     makeAllOfComposite(InnerMatchers)));
-    return BindableMatcher<T>(new DynCastMatcher<T, InnerT>(InnerMatcher));
-  }
-  Matcher<InnerT> InnerMatcher = *InnerMatchers.back();
-  for (int i = InnerMatchers.size() - 2; i >= 0; --i) {
-    InnerMatcher = makeMatcher(
-        new AllOfMatcher<InnerT, Matcher<InnerT>, Matcher<InnerT> >(
-            *InnerMatchers[i], InnerMatcher));
-  }
-  return BindableMatcher<T>(new DynCastMatcher<T, InnerT>(InnerMatcher));
-}
-
+
+
 /// \brief Matches nodes of type T that have at least one descendant node of  VariadicDynCastAllOfMatcher() {}
 };
 

 template <typename T>
 class VariadicNodeMatcher
   : public llvm::VariadicFunction<
+      BindableMatcher<T>, Matcher<T>,
+      makeAllOfComposite<T> > {
+public:
+  VariadicNodeMatcher() {}
+};
+
+} // end namespace internal
+} // end namespace ast_matchers
+} // end namespace clang
 
 
 

unittests/ASTMatchers/ASTMatchersTest.cpp

                       decl(usingDecl())));
 }
 
+TEST(Type, MatchesTypes) {
+  EXPECT_TRUE(notMatches("", type(asString("x")).bind("x")));
+  EXPECT_TRUE(matches("typedef int x; x y;", type(asString("x"))));
+}
+
 TEST(NameableDeclaration, MatchesVariousDecls) {
   DeclarationMatcher NamedX = nameableDeclaration(hasName("X"));
   EXPECT_TRUE(matches("typedef int X;", NamedX));