jranieri-grammatech created this revision. jranieri-grammatech added reviewers: aaron.ballman, klimek, sbenza. Herald added a subscriber: cfe-commits.
This adds a matcher, isStaticLocal, that matches local static variables (i.e. VarDecl::isStaticLocal). Repository: rC Clang https://reviews.llvm.org/D53781 Files: docs/LibASTMatchersReference.html include/clang/ASTMatchers/ASTMatchers.h lib/ASTMatchers/Dynamic/Registry.cpp unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp Index: unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp =================================================================== --- unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp +++ unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp @@ -667,6 +667,14 @@ EXPECT_TRUE(matches("void f() { static int X; }", M)); } +TEST(Matcher, VarDecl_IsStaticLocal) { + auto M = varDecl(isStaticLocal()); + EXPECT_TRUE(matches("void f() { static int X; }", M)); + EXPECT_TRUE(notMatches("static int X;", M)); + EXPECT_TRUE(notMatches("void f() { int X; }", M)); + EXPECT_TRUE(notMatches("int X;", M)); +} + TEST(Matcher, VarDecl_StorageDuration) { std::string T = "void f() { int x; static int y; } int a;static int b;extern int c;"; Index: lib/ASTMatchers/Dynamic/Registry.cpp =================================================================== --- lib/ASTMatchers/Dynamic/Registry.cpp +++ lib/ASTMatchers/Dynamic/Registry.cpp @@ -378,6 +378,7 @@ REGISTER_MATCHER(isPure); REGISTER_MATCHER(isScoped); REGISTER_MATCHER(isSignedInteger); + REGISTER_MATCHER(isStaticLocal); REGISTER_MATCHER(isStaticStorageClass); REGISTER_MATCHER(isStruct); REGISTER_MATCHER(isTemplateInstantiation); Index: include/clang/ASTMatchers/ASTMatchers.h =================================================================== --- include/clang/ASTMatchers/ASTMatchers.h +++ include/clang/ASTMatchers/ASTMatchers.h @@ -3300,6 +3300,20 @@ InnerMatcher.matches(*Initializer, Finder, Builder)); } +/// \brief Matches a static variable with local scope. +/// +/// Example matches y (matcher = varDecl(isStaticLocal())) +/// \code +/// void f() { +/// int x; +/// static int y; +/// } +/// static int z; +/// \endcode +AST_MATCHER(VarDecl, isStaticLocal) { + return Node.isStaticLocal(); +} + /// Matches a variable declaration that has function scope and is a /// non-static local variable. /// Index: docs/LibASTMatchersReference.html =================================================================== --- docs/LibASTMatchersReference.html +++ docs/LibASTMatchersReference.html @@ -4123,6 +4123,18 @@ </pre></td></tr> +<tr><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1VarDecl.html">VarDecl</a>></td><td class="name" onclick="toggle('isStaticLocal0')"><a name="isStaticLocal0Anchor">isStaticLocal</a></td><td></td></tr> +<tr><td colspan="4" class="doc" id="isStaticLocal0"><pre>Matches a static variable with local scope. + +Example matches y (matcher = varDecl(isStaticLocal())) +void f() { + int x; + static int y; +} +static int z; +</pre></td></tr> + + <tr><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1VarDecl.html">VarDecl</a>></td><td class="name" onclick="toggle('isStaticStorageClass1')"><a name="isStaticStorageClass1Anchor">isStaticStorageClass</a></td><td></td></tr> <tr><td colspan="4" class="doc" id="isStaticStorageClass1"><pre>Matches variablefunction declarations that have "static" storage class specifier ("static" keyword) written in the source.
Index: unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp =================================================================== --- unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp +++ unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp @@ -667,6 +667,14 @@ EXPECT_TRUE(matches("void f() { static int X; }", M)); } +TEST(Matcher, VarDecl_IsStaticLocal) { + auto M = varDecl(isStaticLocal()); + EXPECT_TRUE(matches("void f() { static int X; }", M)); + EXPECT_TRUE(notMatches("static int X;", M)); + EXPECT_TRUE(notMatches("void f() { int X; }", M)); + EXPECT_TRUE(notMatches("int X;", M)); +} + TEST(Matcher, VarDecl_StorageDuration) { std::string T = "void f() { int x; static int y; } int a;static int b;extern int c;"; Index: lib/ASTMatchers/Dynamic/Registry.cpp =================================================================== --- lib/ASTMatchers/Dynamic/Registry.cpp +++ lib/ASTMatchers/Dynamic/Registry.cpp @@ -378,6 +378,7 @@ REGISTER_MATCHER(isPure); REGISTER_MATCHER(isScoped); REGISTER_MATCHER(isSignedInteger); + REGISTER_MATCHER(isStaticLocal); REGISTER_MATCHER(isStaticStorageClass); REGISTER_MATCHER(isStruct); REGISTER_MATCHER(isTemplateInstantiation); Index: include/clang/ASTMatchers/ASTMatchers.h =================================================================== --- include/clang/ASTMatchers/ASTMatchers.h +++ include/clang/ASTMatchers/ASTMatchers.h @@ -3300,6 +3300,20 @@ InnerMatcher.matches(*Initializer, Finder, Builder)); } +/// \brief Matches a static variable with local scope. +/// +/// Example matches y (matcher = varDecl(isStaticLocal())) +/// \code +/// void f() { +/// int x; +/// static int y; +/// } +/// static int z; +/// \endcode +AST_MATCHER(VarDecl, isStaticLocal) { + return Node.isStaticLocal(); +} + /// Matches a variable declaration that has function scope and is a /// non-static local variable. /// Index: docs/LibASTMatchersReference.html =================================================================== --- docs/LibASTMatchersReference.html +++ docs/LibASTMatchersReference.html @@ -4123,6 +4123,18 @@ </pre></td></tr> +<tr><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1VarDecl.html">VarDecl</a>></td><td class="name" onclick="toggle('isStaticLocal0')"><a name="isStaticLocal0Anchor">isStaticLocal</a></td><td></td></tr> +<tr><td colspan="4" class="doc" id="isStaticLocal0"><pre>Matches a static variable with local scope. + +Example matches y (matcher = varDecl(isStaticLocal())) +void f() { + int x; + static int y; +} +static int z; +</pre></td></tr> + + <tr><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1VarDecl.html">VarDecl</a>></td><td class="name" onclick="toggle('isStaticStorageClass1')"><a name="isStaticStorageClass1Anchor">isStaticStorageClass</a></td><td></td></tr> <tr><td colspan="4" class="doc" id="isStaticStorageClass1"><pre>Matches variablefunction declarations that have "static" storage class specifier ("static" keyword) written in the source.
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits