Add isAnyPointer and isPointer matchers. Register missing matchers.

[flx]

Summary

The isPointer matcher is useful for http://reviews.llvm.org/D15623.

[klimek]

include/clang/ASTMatchers/ASTMatchers.h

3558 ↗

(On Diff #43768)

Sorry for the delay in review. Would be interesting to get an example that is different between isAnyPointerType and isPointerType.

[flx]

include/clang/ASTMatchers/ASTMatchers.h

3558 ↗

(On Diff #43768)

The definitions of Type::isAnyPointer() is:

return isPointerType() || isObjCObjectPointerType();

Is there a straightforward way to test objc code in these unit tests?

If not I can also remove the isAnyPointer() matcher.

[klimek]

include/clang/ASTMatchers/ASTMatchers.h

3558 ↗

(On Diff #43768)

We already have some obj-c tests (see line 932 for example)

[flx]

include/clang/ASTMatchers/ASTMatchers.h

3558 ↗

(On Diff #43768)

I don't know enough objectie c to create a class, instantiate an object and point a pointer to it. But looking at the definition of the pointsToMatcher it also simply uses isAnyPointer(). So I'm wondering if we should only define isPointer() here but use isAnyPointerType() to be consistent with it.

[klimek]

include/clang/ASTMatchers/ASTMatchers.h

3558 ↗

(On Diff #43768)

Shouldn't we then not just define isAnyPointer?

[klimek]

LG.

I think it's time to get your commit access ;)

cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h

 ///   void c(double);
 /// \endcode
 /// functionDecl(hasAnyParameter(hasType(isAnyCharacter())))
 /// matches "a(char)", "b(wchar_t)", but not "c(double)".
 AST_MATCHER(QualType, isAnyCharacter) {
     return Node->isAnyCharacterType();
 }
 
+//// \brief Matches QualType nodes that are of any pointer type.
+///
+/// Given
+/// \code
+///   int *i = nullptr;
+///   int j;
+/// \endcode
+/// varDecl(hasType(isAnyPointer()))
+///   matches "int *i", but not "int j".
+AST_MATCHER(QualType, isAnyPointer) {
+  return Node->isAnyPointerType();
+}
+
 /// \brief Matches QualType nodes that are const-qualified, i.e., that
 /// include "top-level" const.
 ///
 /// Given
 /// \code
 ///   void a(int);
 ///   void b(int const);
 ///   void c(const int);

cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp

RegistryMaps::RegistryMaps() {
   REGISTER_MATCHER(ignoringParenImpCasts);
   REGISTER_MATCHER(implicitCastExpr);
   REGISTER_MATCHER(incompleteArrayType);
   REGISTER_MATCHER(initListExpr);
   REGISTER_MATCHER(injectedClassNameType);
   REGISTER_MATCHER(innerType);
   REGISTER_MATCHER(integerLiteral);
   REGISTER_MATCHER(isAnonymous);
+  REGISTER_MATCHER(isAnyCharacter);
+  REGISTER_MATCHER(isAnyPointer);
   REGISTER_MATCHER(isArrow);
   REGISTER_MATCHER(isBaseInitializer);
   REGISTER_MATCHER(isCatchAll);
   REGISTER_MATCHER(isClass);
   REGISTER_MATCHER(isConst);
   REGISTER_MATCHER(isConstQualified);
   REGISTER_MATCHER(isCopyAssignmentOperator);
   REGISTER_MATCHER(isCopyConstructor);

cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp

 
 TEST(IsInteger, ReportsNoFalsePositives) {
   EXPECT_TRUE(notMatches("int *i;", varDecl(hasType(isInteger()))));
   EXPECT_TRUE(notMatches("struct T {}; T t; void f(T *) { }; void g() {f(&t);}",
                       callExpr(hasArgument(0, declRefExpr(
                           to(varDecl(hasType(isInteger()))))))));
 }
 
+TEST(IsAnyPointer, MatchesPointers) {
+  EXPECT_TRUE(matches("int* i = nullptr;", varDecl(hasType(isAnyPointer()))));
+}
+
+TEST(IsAnyPointer, ReportsNoFalsePositives) {
+  EXPECT_TRUE(notMatches("int i = 0;", varDecl(hasType(isAnyPointer()))));
+}
+
 TEST(IsAnyCharacter, MatchesCharacters) {
   EXPECT_TRUE(matches("char i = 0;", varDecl(hasType(isAnyCharacter()))));
 }
 
 TEST(IsAnyCharacter, ReportsNoFalsePositives) {
   EXPECT_TRUE(notMatches("int i;", varDecl(hasType(isAnyCharacter()))));
 }