I think the right fix will be to #ifdef out those test on windows ...<br><br><div class="gmail_quote">On Mon Nov 24 2014 at 6:37:48 PM Manuel Klimek <<a href="mailto:klimek@google.com">klimek@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Sorry - feel free to roll back for now.<br><br><div class="gmail_quote">On Mon Nov 24 2014 at 6:26:26 PM Aaron Ballman <<a href="mailto:aaron@aaronballman.com" target="_blank">aaron@aaronballman.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This also appears to have broken the build.<br>
<br>
<a href="http://bb.pgr.jp/builders/ninja-clang-i686-msc17-R/builds/11716/steps/build_clang/logs/stdio" target="_blank">http://bb.pgr.jp/builders/<u></u>ninj<u></u>a-clang-i686-msc17-R/<u></u>builds/<u></u>11716/steps/build_<u></u>clang/logs/<u></u>stdio</a><br>
<br>
I've made a fix in r222664 to get the build unbroken, however, the<br>
tests still fail for me on Windows.<br>
<br>
~Aaron<br>
<br>
On Mon, Nov 24, 2014 at 10:51 AM, Aaron Ballman <<a href="mailto:aaron@aaronballman.com" target="_blank">aaron@aaronballman.com</a>> wrote:<br>
> On Mon, Nov 24, 2014 at 4:10 AM, Manuel Klimek <<a href="mailto:klimek@google.com" target="_blank">klimek@google.com</a>> wrote:<br>
>> Author: klimek<br>
>> Date: Mon Nov 24 03:10:56 2014<br>
>> New Revision: 222646<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=222646&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject?rev=222646&view=rev</a><br>
>> Log:<br>
>> Adding 4 ASTMatchers: typedefDecl, isInMainFile, isInSystemFile, isInFileMatchingName<br>
>><br>
>> Summary:<br>
>> Often one is only interested in matches within the main-file or matches<br>
>> that are not within a system-header, for which this patch adds<br>
>> isInMainFile and isInSystemFile. They take no arguments and narrow down<br>
>> the matches.<br>
>><br>
>> The isInFileMatchingName is mainly thought for interactive<br>
>> clang-query-sessions, to make a matcher more specific without restarting<br>
>> the session with the files you are interested in for that moment. It<br>
>> takes a string that will be used as regular-expression to match the<br>
>> filename of where the matched node is expanded.<br>
>><br>
>> Patch by Hendrik von Prince.<br>
>><br>
>> Modified:<br>
>> cfe/trunk/docs/<u></u>LibASTMatchers<u></u>Reference.html<br>
>> cfe/trunk/include/clang/<u></u>ASTMa<u></u>tchers/ASTMatchers.h<br>
>> cfe/trunk/include/clang/<u></u>Tooli<u></u>ng/Tooling.h<br>
>> cfe/trunk/lib/ASTMatchers/<u></u>Dyn<u></u>amic/Registry.cpp<br>
>> cfe/trunk/lib/Tooling/<u></u>Tooling.<u></u>cpp<br>
>> cfe/trunk/unittests/<u></u>ASTMatche<u></u>rs/ASTMatchersTest.<u></u>cpp<br>
>> cfe/trunk/unittests/<u></u>ASTMatche<u></u>rs/ASTMatchersTest.h<br>
>><br>
>> Modified: cfe/trunk/docs/<u></u>LibASTMatchersR<u></u>eference.html<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/LibASTMatchersReference.html?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/docs/<u></u>LibASTMat<u></u>chersReference.html?<u></u>rev=<u></u>222646&r1=222645&r2=<u></u>222646&<u></u>view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/docs/<u></u>LibASTMatchersR<u></u>eference.html (original)<br>
>> +++ cfe/trunk/docs/<u></u>LibASTMatchersR<u></u>eference.html Mon Nov 24 03:10:56 2014<br>
>> @@ -307,6 +307,16 @@ Example matches X, Z<br>
>> </pre></td></tr><br>
>><br>
>><br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('typedefDecl0'<u></u><u></u>)"><a name="typedefDecl0Anchor"><u></u>type<u></u>defDecl</a></td><td><u></u>Matcher&<u></u>lt<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypedefDecl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_<u></u>1TypedefDec<u></u>l.html</a>"><u></u>TypedefDecl</a>>...<u></u></td></<u></u>tr><br>
>> +<tr><td colspan="4" class="doc" id="typedefDecl0"><pre>Matches typedef declarations.<br>
>> +<br>
>> +Given<br>
>> + typedef int X;<br>
>> +typedefDecl()<br>
>> + matches "typedef int X"<br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> <tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('<u></u>unresolvedUsi<u></u>ngValueDecl0')"><<u></u>a name="<u></u>unresolvedUsingValueDecl<u></u>0Ancho<u></u>r"><u></u>unresolvedUsingValueDecl</<u></u>a></<u></u>td><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1UnresolvedUsingValueDecl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_<u></u>1Unresolved<u></u>UsingValueDecl.html</a><u></u>"><u></u>UnresolvedUsingValueDecl</a><u></u>&<u></u>gt;...</td></tr><br>
>> <tr><td colspan="4" class="doc" id="unresolvedUsingValueDecl0"<u></u><u></u>><pre>Matches unresolved using value declarations.<br>
>><br>
>> @@ -339,6 +349,15 @@ usingDirectiveDecl()<br>
>> matches using namespace X </pre></td></tr><br>
>><br>
>><br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('valueDecl0')"<u></u><u></u>><a name="valueDecl0Anchor"><u></u>valueD<u></u>ecl</a></td><td>Matcher&<u></u>lt<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1ValueDecl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_<u></u>1ValueDecl.<u></u>html</a>">ValueDecl</a><u></u>>...</<u></u>td></tr><br>
>> +<tr><td colspan="4" class="doc" id="valueDecl0"><pre>Matches any value declaration.<br>
>> +<br>
>> +Example matches A, B, C and F<br>
>> + enum X { A, B, C };<br>
>> + void F();<br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> <tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('varDecl0')"><<u></u><u></u>a name="varDecl0Anchor">varDecl<<u></u><u></u>/a></td><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1VarDecl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1VarDecl.<u></u>ht<u></u>ml</a>">VarDecl</a>>...</td><<u></u>/<u></u>tr><br>
>> <tr><td colspan="4" class="doc" id="varDecl0"><pre>Matches variable declarations.<br>
>><br>
>> @@ -1654,6 +1673,48 @@ f.<br>
>> </pre></td></tr><br>
>><br>
>><br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>FileMatching0')"><u></u><a name="<u></u>isExpansionInFileMatchin<u></u>g0Anch<u></u>or"><u></u>isExpansionInFileMatching<<u></u>/a><<u></u>/td><td>std::string RegExp</td></tr><br>
>> +<tr><td colspan="4" class="doc" id="<u></u>isExpansionInFileMatching0<u></u>"><<u></u>pre>Matches AST nodes that were expanded within files whose name is<br>
>> +partially matching a given regex.<br>
>> +<br>
>> +Example matches Y but not X<br>
>> + (matcher = recordDecl(<u></u>isExpansionInFileMa<u></u>tching("<u></u>AST.*"))<br>
>> + #include "ASTMatcher.h"<br>
>> + class X {};<br>
>> +ASTMatcher.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>MainFile0')"><a name="<u></u>isExpansionInMainFile0An<u></u>chor"><u></u>isExpansionInMainFile</<u></u>a></td><u></u><td></td></tr><br>
>> +<tr><td colspan="4" class="doc" id="isExpansionInMainFile0"><<u></u>p<u></u>re>Matches AST nodes that were expanded within the main-file.<br>
>> +<br>
>> +Example matches X but not Y (matcher = recordDecl(<u></u>isExpansionInMainFi<u></u>le())<br>
>> + #include <Y.h><br>
>> + class X {};<br>
>> +Y.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>SystemHeader0')"><u></u><a name="<u></u>isExpansionInSystemHeade<u></u>r0Anch<u></u>or"><u></u>isExpansionInSystemHeader<<u></u>/a><<u></u>/td><td></td></tr><br>
>> +<tr><td colspan="4" class="doc" id="<u></u>isExpansionInSystemHeader0<u></u>"><<u></u>pre>Matches AST nodes that were expanded within system-header-files.<br>
>> +<br>
>> +Example matches Y but not X<br>
>> + (matcher = recordDecl(<u></u>isExpansionInSystem<u></u>Header())<br>
>> + #include <SystemHeader.h><br>
>> + class X {};<br>
>> +SystemHeader.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> <tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>></td><td class="name" onclick="toggle('isImplicit0')<u></u><u></u>"><a name="isImplicit0Anchor"><u></u>isImp<u></u>licit</a></td><td></td></<u></u>tr><br>
>> <tr><td colspan="4" class="doc" id="isImplicit0"><pre>Matches a declaration that has been implicitly added<br>
>> by the compiler (eg. implicit defaultcopy constructors).<br>
>> @@ -1858,7 +1919,7 @@ memberExpr(isArrow())<br>
>> </pre></td></tr><br>
>><br>
>><br>
>> -<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1NamedDecl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_<u></u>1NamedDecl.<u></u>html</a>">NamedDecl</a><u></u>></td><<u></u>td class="name" onclick="toggle('hasName0')"><<u></u><u></u>a name="hasName0Anchor">hasName<<u></u><u></u>/a></td><td>std::string Name</td></tr><br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1NamedDecl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_<u></u>1NamedDecl.<u></u>html</a>">NamedDecl</a><u></u>></td><<u></u>td class="name" onclick="toggle('hasName0')"><<u></u><u></u>a name="hasName0Anchor">hasName<<u></u><u></u>/a></td><td>std::string Name</td></tr><br>
>> <tr><td colspan="4" class="doc" id="hasName0"><pre>Matches NamedDecl nodes that have the specified name.<br>
>><br>
>> Supports specifying enclosing namespaces or classes by prefixing the name<br>
>> @@ -1990,6 +2051,48 @@ and reference to that variable declarati<br>
>> </pre></td></tr><br>
>><br>
>><br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>FileMatching1')"><u></u><a name="<u></u>isExpansionInFileMatchin<u></u>g1Anch<u></u>or"><u></u>isExpansionInFileMatching<<u></u>/a><<u></u>/td><td>std::string RegExp</td></tr><br>
>> +<tr><td colspan="4" class="doc" id="<u></u>isExpansionInFileMatching1<u></u>"><<u></u>pre>Matches AST nodes that were expanded within files whose name is<br>
>> +partially matching a given regex.<br>
>> +<br>
>> +Example matches Y but not X<br>
>> + (matcher = recordDecl(<u></u>isExpansionInFileMa<u></u>tching("<u></u>AST.*"))<br>
>> + #include "ASTMatcher.h"<br>
>> + class X {};<br>
>> +ASTMatcher.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>MainFile1')"><a name="<u></u>isExpansionInMainFile1An<u></u>chor"><u></u>isExpansionInMainFile</<u></u>a></td><u></u><td></td></tr><br>
>> +<tr><td colspan="4" class="doc" id="isExpansionInMainFile1"><<u></u>p<u></u>re>Matches AST nodes that were expanded within the main-file.<br>
>> +<br>
>> +Example matches X but not Y (matcher = recordDecl(<u></u>isExpansionInMainFi<u></u>le())<br>
>> + #include <Y.h><br>
>> + class X {};<br>
>> +Y.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>SystemHeader1')"><u></u><a name="<u></u>isExpansionInSystemHeade<u></u>r1Anch<u></u>or"><u></u>isExpansionInSystemHeader<<u></u>/a><<u></u>/td><td></td></tr><br>
>> +<tr><td colspan="4" class="doc" id="<u></u>isExpansionInSystemHeader1<u></u>"><<u></u>pre>Matches AST nodes that were expanded within system-header-files.<br>
>> +<br>
>> +Example matches Y but not X<br>
>> + (matcher = recordDecl(<u></u>isExpansionInSystem<u></u>Header())<br>
>> + #include <SystemHeader.h><br>
>> + class X {};<br>
>> +SystemHeader.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> <tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>></td><td class="name" onclick="toggle('<u></u>isInTemplateI<u></u>nstantiation0')"><u></u><a name="<u></u>isInTemplateInstantiatio<u></u>n0Anch<u></u>or"><u></u>isInTemplateInstantiation<<u></u>/a><<u></u>/td><td></td></tr><br>
>> <tr><td colspan="4" class="doc" id="<u></u>isInTemplateInstantiation0<u></u>"><<u></u>pre>Matches statements inside of a template instantiation.<br>
>><br>
>> @@ -2061,6 +2164,48 @@ classTemplateSpecializationDec<u></u><u></u>l(template<br>
>> </pre></td></tr><br>
>><br>
>><br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>FileMatching2')"><u></u><a name="<u></u>isExpansionInFileMatchin<u></u>g2Anch<u></u>or"><u></u>isExpansionInFileMatching<<u></u>/a><<u></u>/td><td>std::string RegExp</td></tr><br>
>> +<tr><td colspan="4" class="doc" id="<u></u>isExpansionInFileMatching2<u></u>"><<u></u>pre>Matches AST nodes that were expanded within files whose name is<br>
>> +partially matching a given regex.<br>
>> +<br>
>> +Example matches Y but not X<br>
>> + (matcher = recordDecl(<u></u>isExpansionInFileMa<u></u>tching("<u></u>AST.*"))<br>
>> + #include "ASTMatcher.h"<br>
>> + class X {};<br>
>> +ASTMatcher.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>MainFile2')"><a name="<u></u>isExpansionInMainFile2An<u></u>chor"><u></u>isExpansionInMainFile</<u></u>a></td><u></u><td></td></tr><br>
>> +<tr><td colspan="4" class="doc" id="isExpansionInMainFile2"><<u></u>p<u></u>re>Matches AST nodes that were expanded within the main-file.<br>
>> +<br>
>> +Example matches X but not Y (matcher = recordDecl(<u></u>isExpansionInMainFi<u></u>le())<br>
>> + #include <Y.h><br>
>> + class X {};<br>
>> +Y.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> +<tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>></td><td class="name" onclick="toggle('<u></u>isExpansionIn<u></u>SystemHeader2')"><u></u><a name="<u></u>isExpansionInSystemHeade<u></u>r2Anch<u></u>or"><u></u>isExpansionInSystemHeader<<u></u>/a><<u></u>/td><td></td></tr><br>
>> +<tr><td colspan="4" class="doc" id="<u></u>isExpansionInSystemHeader2<u></u>"><<u></u>pre>Matches AST nodes that were expanded within system-header-files.<br>
>> +<br>
>> +Example matches Y but not X<br>
>> + (matcher = recordDecl(<u></u>isExpansionInSystem<u></u>Header())<br>
>> + #include <SystemHeader.h><br>
>> + class X {};<br>
>> +SystemHeader.h:<br>
>> + class Y {};<br>
>> +<br>
>> +Usable as: Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Decl.<u></u>html</a>"<u></u>>Decl</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Stmt.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Stmt.<u></u>html</a>"<u></u>>Stmt</a>>, Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1TypeLoc.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1TypeLoc.<u></u>ht<u></u>ml</a>">TypeLoc</a>><br>
>> +</pre></td></tr><br>
>> +<br>
>> +<br>
>> <tr><td>Matcher<<a href="<a href="http://clang.llvm.org/doxygen/classclang_1_1Type.html" target="_blank">http://clang.llvm.org/<u></u>do<u></u>xygen/classclang_1_1Type.<u></u>html</a>"<u></u>>Type</a>></td><td class="name" onclick="toggle('<u></u>equalsBoundNo<u></u>de2')"><a name="equalsBoundNode2Anchor"><u></u><u></u>equalsBoundNode</a></td><td><u></u>st<u></u>d::string ID</td></tr><br>
>> <tr><td colspan="4" class="doc" id="equalsBoundNode2"><pre><u></u>Mat<u></u>ches if a node equals a previously bound node.<br>
>><br>
>><br>
>> Modified: cfe/trunk/include/clang/<u></u>ASTMat<u></u>chers/ASTMatchers.h<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/include/<u></u>clang/<u></u>ASTMatchers/ASTMatchers.<u></u>h?rev=<u></u>222646&r1=222645&r2=<u></u>222646&<u></u>view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/include/clang/<u></u>ASTMat<u></u>chers/ASTMatchers.h (original)<br>
>> +++ cfe/trunk/include/clang/<u></u>ASTMat<u></u>chers/ASTMatchers.h Mon Nov 24 03:10:56 2014<br>
>> @@ -47,6 +47,7 @@<br>
>><br>
>> #include "clang/AST/DeclFriend.h"<br>
>> #include "clang/AST/DeclTemplate.h"<br>
>> +#include "clang/AST/ASTContext.h"<br>
>> #include "clang/ASTMatchers/<u></u>ASTMatchers<u></u>Internal.h"<br>
>> #include "clang/ASTMatchers/<u></u>ASTMatchers<u></u>Macros.h"<br>
>> #include "llvm/ADT/Twine.h"<br>
>> @@ -142,6 +143,97 @@ typedef internal::Matcher<<u></u>NestedNameSp<u></u>ec<br>
>> /// Usable as: Any Matcher<br>
>> inline internal::TrueMatcher anything() { return internal::TrueMatcher(); }<br>
>><br>
>> +/// \brief Matches typedef declarations.<br>
>> +///<br>
>> +/// Given<br>
>> +/// \code<br>
>> +/// typedef int X;<br>
>> +/// \endcode<br>
>> +/// typedefDecl()<br>
>> +/// matches "typedef int X"<br>
>> +const internal::<u></u>VariadicDynCastAllOf<u></u>Matcher<<u></u>Decl, TypedefDecl> typedefDecl;<br>
>> +<br>
>> +/// \brief Matches AST nodes that were expanded within the main-file.<br>
>> +///<br>
>> +/// Example matches X but not Y (matcher = recordDecl(<u></u>isExpansionInMainFi<u></u>le())<br>
>> +/// \code<br>
>> +/// #include <Y.h><br>
>> +/// class X {};<br>
>> +/// \endcode<br>
>> +/// Y.h:<br>
>> +/// \code<br>
>> +/// class Y {};<br>
>> +/// \endcode<br>
>> +///<br>
>> +/// Usable as: Matcher<Decl>, Matcher<Stmt>, Matcher<TypeLoc><br>
>> +AST_POLYMORPHIC_MATCHER(<u></u>isExp<u></u>ansionInMainFile,<br>
>> + AST_POLYMORPHIC_SUPPORTED_<u></u>TYPE<u></u>S_3(Decl, Stmt,<br>
>> + TypeLoc)) {<br>
>> + auto &SourceManager = Finder->getASTContext().<u></u>getSou<u></u>rceManager();<br>
>> + return SourceManager.isInMainFile(<br>
>> + SourceManager.getExpansionLoc(<u></u><u></u>Node.getLocStart()));<br>
>> +}<br>
>> +<br>
>> +/// \brief Matches AST nodes that were expanded within system-header-files.<br>
>> +///<br>
>> +/// Example matches Y but not X<br>
>> +/// (matcher = recordDecl(<u></u>isExpansionInSystem<u></u>Header())<br>
>> +/// \code<br>
>> +/// #include <SystemHeader.h><br>
>> +/// class X {};<br>
>> +/// \endcode<br>
>> +/// SystemHeader.h:<br>
>> +/// \code<br>
>> +/// class Y {};<br>
>> +/// \endcode<br>
>> +///<br>
>> +/// Usable as: Matcher<Decl>, Matcher<Stmt>, Matcher<TypeLoc><br>
>> +AST_POLYMORPHIC_MATCHER(<u></u>isExp<u></u>ansionInSystemHeader,<br>
>> + AST_POLYMORPHIC_SUPPORTED_<u></u>TYPE<u></u>S_3(Decl, Stmt,<br>
>> + TypeLoc)) {<br>
>> + auto &SourceManager = Finder->getASTContext().<u></u>getSou<u></u>rceManager();<br>
>> + auto ExpansionLoc = SourceManager.getExpansionLoc(<u></u><u></u>Node.getLocStart());<br>
>> + if (ExpansionLoc.isInvalid()) {<br>
>> + return false;<br>
>> + }<br>
>> + return SourceManager.<u></u>isInSystemHeader<u></u>(ExpansionLoc)<u></u>;<br>
>> +}<br>
>> +<br>
>> +/// \brief Matches AST nodes that were expanded within files whose name is<br>
>> +/// partially matching a given regex.<br>
>> +///<br>
>> +/// Example matches Y but not X<br>
>> +/// (matcher = recordDecl(<u></u>isExpansionInFileMa<u></u>tching("<u></u>AST.*"))<br>
>> +/// \code<br>
>> +/// #include "ASTMatcher.h"<br>
>> +/// class X {};<br>
>> +/// \endcode<br>
>> +/// ASTMatcher.h:<br>
>> +/// \code<br>
>> +/// class Y {};<br>
>> +/// \endcode<br>
>> +///<br>
>> +/// Usable as: Matcher<Decl>, Matcher<Stmt>, Matcher<TypeLoc><br>
>> +AST_POLYMORPHIC_MATCHER_P(<u></u>isE<u></u>xpansionInFileMatching,<br>
>> + AST_POLYMORPHIC_SUPPORTED_<u></u>TYPE<u></u>S_3(Decl, Stmt,<br>
>> + TypeLoc),<br>
>> + std::string, RegExp) {<br>
>> + auto &SourceManager = Finder->getASTContext().<u></u>getSou<u></u>rceManager();<br>
>> + auto ExpansionLoc = SourceManager.getExpansionLoc(<u></u><u></u>Node.getLocStart());<br>
>> + if (ExpansionLoc.isInvalid()) {<br>
>> + return false;<br>
>> + }<br>
>> + auto FileEntry =<br>
>> + SourceManager.<u></u>getFileEntryForI<u></u>D(<u></u>SourceManager.getFileID(<u></u>Expa<u></u>nsionLoc));<br>
>> + if (!FileEntry) {<br>
>> + return false;<br>
>> + }<br>
>> +<br>
>> + auto Filename = FileEntry->getName();<br>
>> + llvm::Regex RE(RegExp);<br>
>> + return RE.match(Filename);<br>
>> +}<br>
>> +<br>
>> /// \brief Matches declarations.<br>
>> ///<br>
>> /// Examples matches \c X, \c C, and the friend declaration inside \c C;<br>
>><br>
>> Modified: cfe/trunk/include/clang/<u></u>Toolin<u></u>g/Tooling.h<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Tooling.h?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/include/<u></u>clang/<u></u>Tooling/Tooling.h?rev=<u></u>222646&<u></u>r1=222645&r2=222646&<u></u>view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/include/clang/<u></u>Toolin<u></u>g/Tooling.h (original)<br>
>> +++ cfe/trunk/include/clang/<u></u>Toolin<u></u>g/Tooling.h Mon Nov 24 03:10:56 2014<br>
>> @@ -143,6 +143,10 @@ inline std::unique_ptr<<u></u>FrontendAction<u></u>Fac<br>
>> bool runToolOnCode(clang::<u></u>FrontendA<u></u>ction *ToolAction, const Twine &Code,<br>
>> const Twine &FileName = "input.cc");<br>
>><br>
>> +/// The first part of the pair is the filename, the second part the<br>
>> +/// file-content.<br>
>> +typedef std::vector<std::pair<std::<u></u>str<u></u>ing, std::string>> FileContentMappings;<br>
>> +<br>
>> /// \brief Runs (and deletes) the tool on 'Code' with the -fsyntax-only flag and<br>
>> /// with additional other flags.<br>
>> ///<br>
>> @@ -152,9 +156,10 @@ bool runToolOnCode(clang::<u></u>FrontendA<u></u>ction<br>
>> /// \param FileName The file name which 'Code' will be mapped as.<br>
>> ///<br>
>> /// \return - True if 'ToolAction' was successfully executed.<br>
>> -bool runToolOnCodeWithArgs(clang::<u></u>F<u></u>rontendAction *ToolAction, const Twine &Code,<br>
>> - const std::vector<std::string> &Args,<br>
>> - const Twine &FileName = "input.cc");<br>
>> +bool runToolOnCodeWithArgs(<br>
>> + clang::FrontendAction *ToolAction, const Twine &Code,<br>
>> + const std::vector<std::string> &Args, const Twine &FileName = "input.cc",<br>
>> + const FileContentMappings &VirtualMappedFiles = FileContentMappings());<br>
>><br>
>> /// \brief Builds an AST for 'Code'.<br>
>> ///<br>
>><br>
>> Modified: cfe/trunk/lib/ASTMatchers/<u></u>Dyna<u></u>mic/Registry.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/lib/<u></u>ASTMatcher<u></u>s/Dynamic/Registry.<u></u>cpp?rev=<u></u>222646&r1=222645&r2=<u></u>222646&<u></u>view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/lib/ASTMatchers/<u></u>Dyna<u></u>mic/Registry.cpp (original)<br>
>> +++ cfe/trunk/lib/ASTMatchers/<u></u>Dyna<u></u>mic/Registry.cpp Mon Nov 24 03:10:56 2014<br>
>> @@ -242,7 +242,10 @@ RegistryMaps::RegistryMaps() {<br>
>> REGISTER_MATCHER(isExpr);<br>
>> REGISTER_MATCHER(isExternC);<br>
>> REGISTER_MATCHER(isImplicit);<br>
>> + REGISTER_MATCHER(<u></u>isExpansionIn<u></u>FileMatching);<br>
>> + REGISTER_MATCHER(<u></u>isExpansionIn<u></u>MainFile);<br>
>> REGISTER_MATCHER(<u></u>isInstantiate<u></u>d);<br>
>> + REGISTER_MATCHER(<u></u>isExpansionIn<u></u>SystemHeader);<br>
>> REGISTER_MATCHER(isInteger);<br>
>> REGISTER_MATCHER(isIntegral);<br>
>> REGISTER_MATCHER(<u></u>isInTemplateI<u></u>nstantiation);<br>
>> @@ -314,6 +317,7 @@ RegistryMaps::RegistryMaps() {<br>
>> REGISTER_MATCHER(to);<br>
>> REGISTER_MATCHER(tryStmt);<br>
>> REGISTER_MATCHER(type);<br>
>> + REGISTER_MATCHER(typedefDecl);<br>
>> REGISTER_MATCHER(typedefType);<br>
>> REGISTER_MATCHER(typeLoc);<br>
>> REGISTER_MATCHER(<u></u>unaryExprOrTy<u></u>peTraitExpr);<br>
>><br>
>> Modified: cfe/trunk/lib/Tooling/Tooling.<u></u><u></u>cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Tooling.cpp?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/lib/Tooling/<u></u>To<u></u>oling.cpp?rev=222646&r1=<u></u>222645<u></u>&r2=222646&view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/lib/Tooling/Tooling.<u></u><u></u>cpp (original)<br>
>> +++ cfe/trunk/lib/Tooling/Tooling.<u></u><u></u>cpp Mon Nov 24 03:10:56 2014<br>
>> @@ -123,17 +123,25 @@ getSyntaxOnlyToolArgs(const std::vector<<br>
>><br>
>> bool runToolOnCodeWithArgs(clang::<u></u>F<u></u>rontendAction *ToolAction, const Twine &Code,<br>
>> const std::vector<std::string> &Args,<br>
>> - const Twine &FileName) {<br>
>> + const Twine &FileName,<br>
>> + const FileContentMappings &VirtualMappedFiles) {<br>
>> +<br>
>> SmallString<16> FileNameStorage;<br>
>> StringRef FileNameRef = FileName.<u></u>toNullTerminatedStrin<u></u>gRef(<u></u>FileNameStorage);<br>
>> llvm::IntrusiveRefCntPtr<<u></u>FileM<u></u>anager> Files(<br>
>> new FileManager(FileSystemOptions(<u></u><u></u>)));<br>
>> - ToolInvocation Invocation(<u></u>getSyntaxOnlyToolAr<u></u>gs(Args, FileNameRef), ToolAction,<br>
>> - Files.get());<br>
>> + ToolInvocation Invocation(<u></u>getSyntaxOnlyToolAr<u></u>gs(Args, FileNameRef),<br>
>> + ToolAction, Files.get());<br>
>><br>
>> SmallString<1024> CodeStorage;<br>
>> Invocation.mapVirtualFile(<u></u>File<u></u>NameRef,<br>
>> Code.<u></u>toNullTerminatedStringRef<u></u>(<u></u>CodeStorage));<br>
>> +<br>
>> + for (auto &FilenameWithContent : VirtualMappedFiles) {<br>
>> + Invocation.mapVirtualFile(<u></u>File<u></u>nameWithContent.first,<br>
>> + FilenameWithContent.second);<br>
>> + }<br>
>> +<br>
>> return Invocation.run();<br>
>> }<br>
>><br>
>><br>
>> Modified: cfe/trunk/unittests/<u></u>ASTMatcher<u></u>s/ASTMatchersTest.<u></u>cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/unittests/<u></u>ASTM<u></u>atchers/ASTMatchersTest.<u></u>cpp?<u></u>rev=222646&r1=222645&r2=<u></u>222646<u></u>&view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/unittests/<u></u>ASTMatcher<u></u>s/ASTMatchersTest.<u></u>cpp (original)<br>
>> +++ cfe/trunk/unittests/<u></u>ASTMatcher<u></u>s/ASTMatchersTest.<u></u>cpp Mon Nov 24 03:10:56 2014<br>
>> @@ -4625,5 +4625,46 @@ TEST(EqualsBoundNodeMatcher, UnlessDesce<br>
>> .bind("data")));<br>
>> }<br>
>><br>
>> +TEST(TypeDefDeclMatcher, Match) {<br>
>> + EXPECT_TRUE(matches("typedef int typedefDeclTest;",<br>
>> + typedefDecl(hasName("<u></u>typedefDe<u></u>clTest"))));<br>
>> +}<br>
>> +<br>
>> +TEST(Matcher, IsExpansionInMainFileMatcher) {<br>
>> + EXPECT_TRUE(matches("class X {};",<br>
>> + recordDecl(hasName("X"), isExpansionInMainFile())));<br>
>> + EXPECT_TRUE(notMatches("", recordDecl(<u></u>isExpansionInMainFi<u></u>le())));<br>
>> + EXPECT_TRUE(<u></u>matchesConditional<u></u>ly("#include <other>\n",<br>
>> + recordDecl(<u></u>isExpansionInMainF<u></u>ile()), false,<br>
>> + "-isystem/", {{"/other", "class X {};"}}));<br>
>> +}<br>
>> +<br>
>> +TEST(Matcher, IsExpansionInSystemHeader) {<br>
>> + EXPECT_TRUE(<u></u>matchesConditional<u></u>ly(<br>
>> + "#include \"other\"\n", recordDecl(<u></u>isExpansionInSystem<u></u>Header()), true,<br>
>> + "-isystem/", {{"/other", "class X {};"}}));<br>
>> + EXPECT_TRUE(<u></u>matchesConditional<u></u>ly("#include \"other\"\n",<br>
>> + recordDecl(<u></u>isExpansionInSyste<u></u>mHeader()),<br>
>> + false, "-I/", {{"/other", "class X {};"}}));<br>
>> + EXPECT_TRUE(notMatches("class X {};",<br>
>> + recordDecl(<u></u>isExpansionInSyste<u></u>mHeader())))<u></u>;<br>
>> + EXPECT_TRUE(notMatches("", recordDecl(<u></u>isExpansionInSystem<u></u>Header())))<u></u>;<br>
>> +}<br>
>> +<br>
>> +TEST(Matcher, IsExpansionInFileMatching) {<br>
>> + EXPECT_TRUE(<u></u>matchesConditional<u></u>ly(<br>
>> + "#include <foo>\n"<br>
>> + "#include <bar>\n"<br>
>> + "class X {};",<br>
>> + recordDecl(<u></u>isExpansionInFileMa<u></u>tching("b.*<u></u>"), hasName("B")), true,<br>
>> + "-isystem/", {{"/foo", "class A {};"}, {"/bar", "class B {};"}}));<br>
>> + EXPECT_TRUE(<u></u>matchesConditional<u></u>ly(<br>
>> + "#include <foo>\n"<br>
>> + "#include <bar>\n"<br>
>> + "class X {};",<br>
>> + recordDecl(<u></u>isExpansionInFileMa<u></u>tching("f.*<u></u>"), hasName("X")), false,<br>
>> + "-isystem/", {{"/foo", "class A {};"}, {"/bar", "class B {};"}}));<br>
>> +}<br>
>> +<br>
>> } // end namespace ast_matchers<br>
>> } // end namespace clang<br>
>><br>
>> Modified: cfe/trunk/unittests/<u></u>ASTMatcher<u></u>s/ASTMatchersTest.h<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.h?rev=222646&r1=222645&r2=222646&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/unittests/<u></u>ASTM<u></u>atchers/ASTMatchersTest.h?<u></u>rev=<u></u>222646&r1=222645&r2=<u></u>222646&<u></u>view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/unittests/<u></u>ASTMatcher<u></u>s/ASTMatchersTest.h (original)<br>
>> +++ cfe/trunk/unittests/<u></u>ASTMatcher<u></u>s/ASTMatchersTest.h Mon Nov 24 03:10:56 2014<br>
>> @@ -22,6 +22,7 @@ using clang::tooling::<u></u>buildASTFromCo<u></u>deWi<br>
>> using clang::tooling::<u></u>newFrontendAct<u></u>ionFactory;<br>
>> using clang::tooling::<u></u>runToolOnCodeW<u></u>ithArgs;<br>
>> using clang::tooling::<u></u>FrontendAction<u></u>Factory;<br>
>> +using clang::tooling::<u></u>FileContentMap<u></u>pings;<br>
>><br>
>> class BoundNodesCallback {<br>
>> public:<br>
>> @@ -58,10 +59,10 @@ private:<br>
>> };<br>
>><br>
>> template <typename T><br>
>> -testing::AssertionResult matchesConditionally(const std::string &Code,<br>
>> - const T &AMatcher,<br>
>> - bool ExpectMatch,<br>
>> - llvm::StringRef CompileArg) {<br>
>> +testing::AssertionResult matchesConditionally(<br>
>> + const std::string &Code, const T &AMatcher, bool ExpectMatch,<br>
>> + llvm::StringRef CompileArg,<br>
>> + const FileContentMappings &VirtualMappedFiles = FileContentMappings()) {<br>
>> bool Found = false, DynamicFound = false;<br>
>> MatchFinder Finder;<br>
>> VerifyMatch VerifyFound(nullptr, &Found);<br>
>> @@ -73,7 +74,8 @@ testing::AssertionResult matchesConditio<br>
>> newFrontendActionFactory(&<u></u>Find<u></u>er));<br>
>> // Some tests use typeof, which is a gnu extension.<br>
>> std::vector<std::string> Args(1, CompileArg);<br>
>> - if (!runToolOnCodeWithArgs(<u></u>Factor<u></u>y->create(), Code, Args)) {<br>
>> + if (!runToolOnCodeWithArgs(<u></u>Factor<u></u>y->create(), Code, Args, "input.cc",<br>
>> + VirtualMappedFiles)) {<br>
>> return testing::AssertionFailure() << "Parsing error in \"" << Code << "\"";<br>
>> }<br>
>> if (Found != DynamicFound) {<br>
>><br>
><br>
> I am getting failed unit tests from this on Windows, built with MSVC:<br>
><br>
> 61> Running the Clang regression tests<br>
> 61> -- Testing: 7831 tests, 32 threads --<br>
> 61> FAIL: Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>FileMatching<br>
> (7145 of 7831)<br>
> 61> ******************** TEST 'Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>FileMatching'<br>
> FAILED ********************<br>
> 61> Note: Google Test filter = Matcher.<u></u>IsExpansionInFileMatch<u></u>ing<br>
> 61><br>
> 61> [==========] Running 1 test from 1 test case.<br>
> 61><br>
> 61> [----------] Global test environment set-up.<br>
> 61><br>
> 61> [----------] 1 test from Matcher<br>
> 61><br>
> 61> [ RUN ] Matcher.<u></u>IsExpansionInFileMatch<u></u>ing<br>
> 61><br>
> 61>E:\llvm\llvm\tools\clang\<u></u>un<u></u>ittests\ASTMatchers\<u></u>ASTMatcher<u></u>sTest.cpp(4660):<br>
> error : Value of: matchesConditionally( "#include <foo>\n" "#include<br>
> <bar>\n" "class X {};", recordDecl(<u></u>isExpansionInFileMa<u></u>tching("b.*<u></u>"),<br>
> hasName("B")), true, "-isystem/", {{"/foo", "class A {};"}, {"/bar",<br>
> "class B {};"}})<br>
> 61><br>
> 61> Actual: false (Parsing error in "#include <foo><br>
> 61><br>
> 61> #include <bar><br>
> 61><br>
> 61> class X {};")<br>
> 61><br>
> 61> Expected: true<br>
> 61><br>
> 61>E:\llvm\llvm\tools\clang\<u></u>un<u></u>ittests\ASTMatchers\<u></u>ASTMatcher<u></u>sTest.cpp(4666):<br>
> error : Value of: matchesConditionally( "#include <foo>\n" "#include<br>
> <bar>\n" "class X {};", recordDecl(<u></u>isExpansionInFileMa<u></u>tching("f.*<u></u>"),<br>
> hasName("X")), false, "-isystem/", {{"/foo", "class A {};"}, {"/bar",<br>
> "class B {};"}})<br>
> 61><br>
> 61> Actual: false (Parsing error in "#include <foo><br>
> 61><br>
> 61> #include <bar><br>
> 61><br>
> 61> class X {};")<br>
> 61><br>
> 61> Expected: true<br>
> 61><br>
> 61> [ FAILED ] Matcher.<u></u>IsExpansionInFileMatch<u></u>ing (36 ms)<br>
> 61><br>
> 61> [----------] 1 test from Matcher (36 ms total)<br>
> 61><br>
> 61><br>
> 61><br>
> 61> [----------] Global test environment tear-down<br>
> 61><br>
> 61> [==========] 1 test from 1 test case ran. (36 ms total)<br>
> 61><br>
> 61> [ PASSED ] 0 tests.<br>
> 61><br>
> 61> [ FAILED ] 1 test, listed below:<br>
> 61><br>
> 61> [ FAILED ] Matcher.<u></u>IsExpansionInFileMatch<u></u>ing<br>
> 61><br>
> 61><br>
> 61><br>
> 61> 1 FAILED TEST<br>
> 61><br>
> 61> input.cc:1:10: fatal error: 'foo' file not found<br>
> 61><br>
> 61> #include <foo><br>
> 61><br>
> 61> ^<br>
> 61><br>
> 61> 1 error generated.<br>
> 61><br>
> 61> input.cc:1:10: fatal error: 'foo' file not found<br>
> 61><br>
> 61> #include <foo><br>
> 61><br>
> 61> ^<br>
> 61><br>
> 61> 1 error generated.<br>
> 61><br>
> 61><br>
> 61> ********************<br>
> 61> FAIL: Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>MainFileMatcher<br>
> (7146 of 7831)<br>
> 61> ******************** TEST 'Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>MainFileMatcher'<br>
> FAILED ********************<br>
> 61> Note: Google Test filter = Matcher.<u></u>IsExpansionInMainFileM<u></u>atcher<br>
> 61><br>
> 61> [==========] Running 1 test from 1 test case.<br>
> 61><br>
> 61> [----------] Global test environment set-up.<br>
> 61><br>
> 61> [----------] 1 test from Matcher<br>
> 61><br>
> 61> [ RUN ] Matcher.<u></u>IsExpansionInMainFileM<u></u>atcher<br>
> 61><br>
> 61>E:\llvm\llvm\tools\clang\<u></u>un<u></u>ittests\ASTMatchers\<u></u>ASTMatcher<u></u>sTest.cpp(4639):<br>
> error : Value of: matchesConditionally("#include <other>\n",<br>
> recordDecl(<u></u>isExpansionInMainFi<u></u>le()), false, "-isystem/", {{"/other",<br>
> "class X {};"}})<br>
> 61><br>
> 61> Actual: false (Parsing error in "#include <other><br>
> 61><br>
> 61> ")<br>
> 61><br>
> 61> Expected: true<br>
> 61><br>
> 61> [ FAILED ] Matcher.<u></u>IsExpansionInMainFileM<u></u>atcher (64 ms)<br>
> 61><br>
> 61> [----------] 1 test from Matcher (64 ms total)<br>
> 61><br>
> 61><br>
> 61><br>
> 61> [----------] Global test environment tear-down<br>
> 61><br>
> 61> [==========] 1 test from 1 test case ran. (65 ms total)<br>
> 61><br>
> 61> [ PASSED ] 0 tests.<br>
> 61><br>
> 61> [ FAILED ] 1 test, listed below:<br>
> 61><br>
> 61> [ FAILED ] Matcher.<u></u>IsExpansionInMainFileM<u></u>atcher<br>
> 61><br>
> 61><br>
> 61><br>
> 61> 1 FAILED TEST<br>
> 61><br>
> 61> input.cc:1:10: fatal error: 'other' file not found<br>
> 61><br>
> 61> #include <other><br>
> 61><br>
> 61> ^<br>
> 61><br>
> 61> 1 error generated.<br>
> 61><br>
> 61><br>
> 61> ********************<br>
> 61> FAIL: Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>SystemHeader<br>
> (7152 of 7831)<br>
> 61> ******************** TEST 'Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>SystemHeader'<br>
> FAILED ********************<br>
> 61> Note: Google Test filter = Matcher.<u></u>IsExpansionInSystemHea<u></u>der<br>
> 61><br>
> 61> [==========] Running 1 test from 1 test case.<br>
> 61><br>
> 61> [----------] Global test environment set-up.<br>
> 61><br>
> 61> [----------] 1 test from Matcher<br>
> 61><br>
> 61> [ RUN ] Matcher.<u></u>IsExpansionInSystemHea<u></u>der<br>
> 61><br>
> 61>E:\llvm\llvm\tools\clang\<u></u>un<u></u>ittests\ASTMatchers\<u></u>ASTMatcher<u></u>sTest.cpp(4645):<br>
> error : Value of: matchesConditionally( "#include \"other\"\n",<br>
> recordDecl(<u></u>isExpansionInSystem<u></u>Header()), true, "-isystem/",<br>
> {{"/other", "class X {};"}})<br>
> 61><br>
> 61> Actual: false (Parsing error in "#include "other"<br>
> 61><br>
> 61> ")<br>
> 61><br>
> 61> Expected: true<br>
> 61><br>
> 61>E:\llvm\llvm\tools\clang\<u></u>un<u></u>ittests\ASTMatchers\<u></u>ASTMatcher<u></u>sTest.cpp(4648):<br>
> error : Value of: matchesConditionally("#include \"other\"\n",<br>
> recordDecl(<u></u>isExpansionInSystem<u></u>Header()), false, "-I/", {{"/other",<br>
> "class X {};"}})<br>
> 61><br>
> 61> Actual: false (Parsing error in "#include "other"<br>
> 61><br>
> 61> ")<br>
> 61><br>
> 61> Expected: true<br>
> 61><br>
> 61> [ FAILED ] Matcher.<u></u>IsExpansionInSystemHea<u></u>der (91 ms)<br>
> 61><br>
> 61> [----------] 1 test from Matcher (91 ms total)<br>
> 61><br>
> 61><br>
> 61><br>
> 61> [----------] Global test environment tear-down<br>
> 61><br>
> 61> [==========] 1 test from 1 test case ran. (91 ms total)<br>
> 61><br>
> 61> [ PASSED ] 0 tests.<br>
> 61><br>
> 61> [ FAILED ] 1 test, listed below:<br>
> 61><br>
> 61> [ FAILED ] Matcher.<u></u>IsExpansionInSystemHea<u></u>der<br>
> 61><br>
> 61><br>
> 61><br>
> 61> 1 FAILED TEST<br>
> 61><br>
> 61> input.cc:1:10: fatal error: 'other' file not found<br>
> 61><br>
> 61> #include "other"<br>
> 61><br>
> 61> ^<br>
> 61><br>
> 61> 1 error generated.<br>
> 61><br>
> 61> input.cc:1:10: fatal error: 'other' file not found<br>
> 61><br>
> 61> #include "other"<br>
> 61><br>
> 61> ^<br>
> 61><br>
> 61> 1 error generated.<br>
> 61><br>
> 61><br>
> 61> ********************<br>
> 61><br>
> 61> Testing Time: 111.19s<br>
> 61> ********************<br>
> 61> Failing Tests (3):<br>
> 61> Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>FileMatching<br>
> 61> Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>MainFileMatcher<br>
> 61> Clang-Unit ::<br>
> ASTMatchers/Debug/<u></u>ASTMatchersT<u></u>ests.exe/Matcher.<u></u>IsExpansionIn<u></u>SystemHeader<br>
> 61><br>
> 61> Expected Passes : 7745<br>
> 61> Expected Failures : 19<br>
> 61> Unsupported Tests : 64<br>
> 61> Unexpected Failures: 3<br>
><br>
> ~Aaron<br>
</blockquote></div></blockquote></div>