C++: Focus the CPP-205 test on the templates.

Author: geoffw0

cpp/ql/test/library-tests/CPP-205/elements.expected

@@ -1,28 +1,21 @@
-| CPP-205.cpp:0:0:0:0 | CPP-205.cpp |  |
-| CPP-205.cpp:1:20:1:20 | T |  |
-| CPP-205.cpp:1:20:1:20 | definition of T |  |
-| CPP-205.cpp:2:5:2:5 | definition of fn | function declaration entry for int fn<int>(int) |
-| CPP-205.cpp:2:5:2:5 | fn | function int fn<int>(int) |
-| CPP-205.cpp:2:5:2:6 | definition of fn | function declaration entry for int fn<T>(T) |
-| CPP-205.cpp:2:5:2:6 | fn | function int fn<T>(T) |
-| CPP-205.cpp:2:10:2:12 | definition of out | parameter declaration entry for int fn<T>(T) |
-| CPP-205.cpp:2:10:2:12 | definition of out | parameter declaration entry for int fn<int>(int) |
-| CPP-205.cpp:2:10:2:12 | out | parameter for int fn<T>(T) |
-| CPP-205.cpp:2:10:2:12 | out | parameter for int fn<int>(int) |
-| CPP-205.cpp:2:15:5:1 | { ... } |  |
-| CPP-205.cpp:2:15:5:1 | { ... } |  |
-| CPP-205.cpp:3:3:3:33 | declaration |  |
-| CPP-205.cpp:3:3:3:33 | declaration |  |
-| CPP-205.cpp:3:15:3:15 | declaration of y |  |
-| CPP-205.cpp:3:15:3:15 | y |  |
-| CPP-205.cpp:3:17:3:31 | 5 |  |
-| CPP-205.cpp:4:3:4:11 | return ... |  |
-| CPP-205.cpp:4:3:4:11 | return ... |  |
-| CPP-205.cpp:4:10:4:10 | 0 |  |
-| CPP-205.cpp:4:10:4:10 | 0 |  |
+| CPP-205.cpp:2:5:2:5 | definition of fn | function declaration entry for int fn<int>(int), isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:2:5:2:5 | fn | function int fn<int>(int), isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:2:5:2:6 | definition of fn | function declaration entry for int fn<T>(T), isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:2:5:2:6 | fn | function int fn<T>(T), isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:2:10:2:12 | definition of out | isFromTemplateInstantiation(fn), parameter declaration entry for int fn<int>(int) |
+| CPP-205.cpp:2:10:2:12 | definition of out | isFromUninstantiatedTemplate(fn), parameter declaration entry for int fn<T>(T) |
+| CPP-205.cpp:2:10:2:12 | out | isFromTemplateInstantiation(fn), parameter for int fn<int>(int) |
+| CPP-205.cpp:2:10:2:12 | out | isFromUninstantiatedTemplate(fn), parameter for int fn<T>(T) |
+| CPP-205.cpp:2:15:5:1 | { ... } | isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:2:15:5:1 | { ... } | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:3:3:3:33 | declaration | isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:3:3:3:33 | declaration | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:3:15:3:15 | declaration of y | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:3:15:3:15 | y | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:3:17:3:31 | 5 | isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:4:3:4:11 | return ... | isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:4:3:4:11 | return ... | isFromUninstantiatedTemplate(fn) |
+| CPP-205.cpp:4:10:4:10 | 0 | isFromTemplateInstantiation(fn) |
+| CPP-205.cpp:4:10:4:10 | 0 | isFromUninstantiatedTemplate(fn) |
 | CPP-205.cpp:7:5:7:8 | definition of main | function declaration entry for int main() |
 | CPP-205.cpp:7:5:7:8 | main | function int main() |
-| CPP-205.cpp:7:12:9:1 | { ... } |  |
-| CPP-205.cpp:8:3:8:15 | return ... |  |
-| CPP-205.cpp:8:10:8:11 | call to fn |  |
-| CPP-205.cpp:8:13:8:13 | 0 |  |

cpp/ql/test/library-tests/CPP-205/elements.ql

@@ -14,10 +14,20 @@ string describe(Element e) {
   result =
     "parameter declaration entry for " +
       getIdentityString(e.(ParameterDeclarationEntry).getFunctionDeclarationEntry().getFunction())
+  or
+  exists(Element template |
+    e.isFromTemplateInstantiation(template) and
+    result = "isFromTemplateInstantiation(" + template.toString() + ")"
+  )
+  or
+  exists(Element template |
+    e.isFromUninstantiatedTemplate(template) and
+    result = "isFromUninstantiatedTemplate(" + template.toString() + ")"
+  )
 }
 
 from Element e
 where
   e.getLocation().getFile().getBaseName() != "" and
   not e instanceof Folder
-select e, concat(describe(e), ", ")
+select e, strictconcat(describe(e), ", ")