diff --git a/cpp/ql/test/library-tests/syntax-zoo/drawDifferent.expected b/cpp/ql/test/library-tests/syntax-zoo/drawDifferent.expected deleted file mode 100644 index 6e255ec81b29..000000000000 --- a/cpp/ql/test/library-tests/syntax-zoo/drawDifferent.expected +++ /dev/null @@ -1,108 +0,0 @@ -| pointer_to_member__pmIsConstT_extractor | false | 21747 | 21747 | pmIsConstT | -| pointer_to_member__pmIsConstT_extractor | false | 21756 | 21756 | declaration | -| pointer_to_member__pmIsConstT_extractor | false | 21759 | 21759 | return ... | -| pointer_to_member__pmIsConstT_extractor | false | 21762 | 21762 | { ... } | -| pointer_to_member__pmIsConstT_extractor | false | 21766 | 21766 | {...} | -| pointer_to_member__pmIsConstT_extractor | false | 21773 | 21773 | x1 | -| pointer_to_member__pmIsConstT_extractor | false | 21777 | 21777 | & ... | -| pointer_to_member__pmIsConstT_extractor | false | 21784 | 21784 | f1 | -| pointer_to_member__pmIsConstT_extractor | false | 21788 | 21788 | & ... | -| pointer_to_member__pmIsConstT_extractor | false | 21791 | 21791 | initializer for pms | -| pointer_to_member__pmIsConstT_extractor | true | 21756 | 21759 | | -| pointer_to_member__pmIsConstT_extractor | true | 21759 | 21747 | | -| pointer_to_member__pmIsConstT_extractor | true | 21762 | 21756 | | -| pointer_to_member__pmIsConstT_ql | false | 21747 | 21747 | pmIsConstT | -| pointer_to_member__pmIsConstT_ql | false | 21756 | 21756 | declaration | -| pointer_to_member__pmIsConstT_ql | false | 21759 | 21759 | return ... | -| pointer_to_member__pmIsConstT_ql | false | 21762 | 21762 | { ... } | -| pointer_to_member__pmIsConstT_ql | false | 21766 | 21766 | {...} | -| pointer_to_member__pmIsConstT_ql | false | 21773 | 21773 | x1 | -| pointer_to_member__pmIsConstT_ql | false | 21777 | 21777 | & ... | -| pointer_to_member__pmIsConstT_ql | false | 21784 | 21784 | f1 | -| pointer_to_member__pmIsConstT_ql | false | 21788 | 21788 | & ... | -| pointer_to_member__pmIsConstT_ql | false | 21791 | 21791 | initializer for pms | -| pointer_to_member__pmIsConstT_ql | true | 21756 | 21791 | | -| pointer_to_member__pmIsConstT_ql | true | 21759 | 21747 | | -| pointer_to_member__pmIsConstT_ql | true | 21762 | 21756 | | -| pointer_to_member__pmIsConstT_ql | true | 21766 | 21759 | | -| pointer_to_member__pmIsConstT_ql | true | 21773 | 21777 | | -| pointer_to_member__pmIsConstT_ql | true | 21777 | 21784 | | -| pointer_to_member__pmIsConstT_ql | true | 21784 | 21788 | | -| pointer_to_member__pmIsConstT_ql | true | 21788 | 21766 | | -| pointer_to_member__pmIsConstT_ql | true | 21791 | 21773 | | -| staticlocals__staticlocals_f2_extractor | false | 31503 | 31503 | f2 | -| staticlocals__staticlocals_f2_extractor | false | 31509 | 31509 | declaration | -| staticlocals__staticlocals_f2_extractor | false | 31512 | 31512 | declaration | -| staticlocals__staticlocals_f2_extractor | false | 31515 | 31515 | declaration | -| staticlocals__staticlocals_f2_extractor | false | 31518 | 31518 | declaration | -| staticlocals__staticlocals_f2_extractor | false | 31521 | 31521 | return ... | -| staticlocals__staticlocals_f2_extractor | false | 31524 | 31524 | { ... } | -| staticlocals__staticlocals_f2_extractor | false | 31527 | 31527 | call to C | -| staticlocals__staticlocals_f2_extractor | false | 31530 | 31530 | initializer for c | -| staticlocals__staticlocals_f2_extractor | false | 31533 | 31533 | call to addOne | -| staticlocals__staticlocals_f2_extractor | false | 31539 | 31539 | 2 | -| staticlocals__staticlocals_f2_extractor | false | 31544 | 31544 | initializer for j | -| staticlocals__staticlocals_f2_extractor | false | 31546 | 31546 | call to addOne | -| staticlocals__staticlocals_f2_extractor | false | 31554 | 31554 | 2 | -| staticlocals__staticlocals_f2_extractor | false | 31556 | 31556 | initializer for two | -| staticlocals__staticlocals_f2_extractor | false | 31560 | 31560 | two | -| staticlocals__staticlocals_f2_extractor | false | 31568 | 31568 | initializer for i | -| staticlocals__staticlocals_f2_extractor | true | 31509 | 31556 | | -| staticlocals__staticlocals_f2_extractor | true | 31512 | 31515 | | -| staticlocals__staticlocals_f2_extractor | true | 31515 | 31518 | | -| staticlocals__staticlocals_f2_extractor | true | 31518 | 31521 | | -| staticlocals__staticlocals_f2_extractor | true | 31521 | 31503 | | -| staticlocals__staticlocals_f2_extractor | true | 31524 | 31509 | | -| staticlocals__staticlocals_f2_extractor | true | 31554 | 31512 | | -| staticlocals__staticlocals_f2_extractor | true | 31556 | 31554 | | -| staticlocals__staticlocals_f2_ql | false | 31503 | 31503 | f2 | -| staticlocals__staticlocals_f2_ql | false | 31509 | 31509 | declaration | -| staticlocals__staticlocals_f2_ql | false | 31512 | 31512 | declaration | -| staticlocals__staticlocals_f2_ql | false | 31515 | 31515 | declaration | -| staticlocals__staticlocals_f2_ql | false | 31518 | 31518 | declaration | -| staticlocals__staticlocals_f2_ql | false | 31521 | 31521 | return ... | -| staticlocals__staticlocals_f2_ql | false | 31524 | 31524 | { ... } | -| staticlocals__staticlocals_f2_ql | false | 31527 | 31527 | call to C | -| staticlocals__staticlocals_f2_ql | false | 31530 | 31530 | initializer for c | -| staticlocals__staticlocals_f2_ql | false | 31533 | 31533 | call to addOne | -| staticlocals__staticlocals_f2_ql | false | 31539 | 31539 | 2 | -| staticlocals__staticlocals_f2_ql | false | 31544 | 31544 | initializer for j | -| staticlocals__staticlocals_f2_ql | false | 31546 | 31546 | call to addOne | -| staticlocals__staticlocals_f2_ql | false | 31554 | 31554 | 2 | -| staticlocals__staticlocals_f2_ql | false | 31556 | 31556 | initializer for two | -| staticlocals__staticlocals_f2_ql | false | 31560 | 31560 | two | -| staticlocals__staticlocals_f2_ql | false | 31568 | 31568 | initializer for i | -| staticlocals__staticlocals_f2_ql | true | 31509 | 31556 | | -| staticlocals__staticlocals_f2_ql | true | 31512 | 31515 | | -| staticlocals__staticlocals_f2_ql | true | 31515 | 31518 | | -| staticlocals__staticlocals_f2_ql | true | 31518 | 31521 | | -| staticlocals__staticlocals_f2_ql | true | 31518 | 31530 | | -| staticlocals__staticlocals_f2_ql | true | 31521 | 31503 | | -| staticlocals__staticlocals_f2_ql | true | 31524 | 31509 | | -| staticlocals__staticlocals_f2_ql | true | 31527 | 31521 | | -| staticlocals__staticlocals_f2_ql | true | 31530 | 31527 | | -| staticlocals__staticlocals_f2_ql | true | 31554 | 31512 | | -| staticlocals__staticlocals_f2_ql | true | 31556 | 31554 | | -| staticlocals__staticlocals_f3_extractor | false | 31473 | 31473 | f3 | -| staticlocals__staticlocals_f3_extractor | false | 31477 | 31477 | declaration | -| staticlocals__staticlocals_f3_extractor | false | 31480 | 31480 | return ... | -| staticlocals__staticlocals_f3_extractor | false | 31483 | 31483 | { ... } | -| staticlocals__staticlocals_f3_extractor | false | 31492 | 31492 | value | -| staticlocals__staticlocals_f3_extractor | false | 31496 | 31496 | (int)... | -| staticlocals__staticlocals_f3_extractor | false | 31498 | 31498 | initializer for i | -| staticlocals__staticlocals_f3_extractor | true | 31477 | 31480 | | -| staticlocals__staticlocals_f3_extractor | true | 31480 | 31473 | | -| staticlocals__staticlocals_f3_extractor | true | 31483 | 31477 | | -| staticlocals__staticlocals_f3_ql | false | 31473 | 31473 | f3 | -| staticlocals__staticlocals_f3_ql | false | 31477 | 31477 | declaration | -| staticlocals__staticlocals_f3_ql | false | 31480 | 31480 | return ... | -| staticlocals__staticlocals_f3_ql | false | 31483 | 31483 | { ... } | -| staticlocals__staticlocals_f3_ql | false | 31492 | 31492 | value | -| staticlocals__staticlocals_f3_ql | false | 31496 | 31496 | (int)... | -| staticlocals__staticlocals_f3_ql | false | 31498 | 31498 | initializer for i | -| staticlocals__staticlocals_f3_ql | true | 31477 | 31480 | | -| staticlocals__staticlocals_f3_ql | true | 31477 | 31498 | | -| staticlocals__staticlocals_f3_ql | true | 31480 | 31473 | | -| staticlocals__staticlocals_f3_ql | true | 31483 | 31477 | | -| staticlocals__staticlocals_f3_ql | true | 31492 | 31480 | | -| staticlocals__staticlocals_f3_ql | true | 31498 | 31492 | | diff --git a/cpp/ql/test/library-tests/syntax-zoo/drawDifferent.ql b/cpp/ql/test/library-tests/syntax-zoo/drawDifferent.ql deleted file mode 100644 index 5b80f3c92a0c..000000000000 --- a/cpp/ql/test/library-tests/syntax-zoo/drawDifferent.ql +++ /dev/null @@ -1,10 +0,0 @@ -// query-type: graph -import Compare - -from - Element scopeElement, string scopeString, boolean isEdge, ControlFlowNode x, ControlFlowNode y, - string label -where - AllCFG::qltestGraph(scopeElement, scopeString, isEdge, x, y, label) and - differentScope(scopeElement) -select scopeString, isEdge, x, y, label diff --git a/cpp/ql/test/library-tests/syntax-zoo/tellDifferent.expected b/cpp/ql/test/library-tests/syntax-zoo/tellDifferent.expected deleted file mode 100644 index ae6f34298925..000000000000 --- a/cpp/ql/test/library-tests/syntax-zoo/tellDifferent.expected +++ /dev/null @@ -1,14 +0,0 @@ -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:41:3:44:29 | declaration | pointer_to_member.cpp:44:11:44:28 | initializer for pms | Standard edge, only from QL | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:41:3:44:29 | declaration | pointer_to_member.cpp:45:1:45:1 | return ... | Standard edge, only from extractor | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:11:44:28 | initializer for pms | pointer_to_member.cpp:44:14:44:18 | x1 | Standard edge, only from QL | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:11:44:28 | {...} | pointer_to_member.cpp:45:1:45:1 | return ... | Standard edge, only from QL | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:13:44:18 | & ... | pointer_to_member.cpp:44:22:44:26 | f1 | Standard edge, only from QL | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:14:44:18 | x1 | pointer_to_member.cpp:44:13:44:18 | & ... | Standard edge, only from QL | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:21:44:26 | & ... | pointer_to_member.cpp:44:11:44:28 | {...} | Standard edge, only from QL | uninstantiated | -| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:22:44:26 | f1 | pointer_to_member.cpp:44:21:44:26 | & ... | Standard edge, only from QL | uninstantiated | -| staticlocals__staticlocals_f2 | file://:0:0:0:0 | call to C | staticlocals.cpp:30:1:30:1 | return ... | Standard edge, only from QL | | -| staticlocals__staticlocals_f2 | file://:0:0:0:0 | initializer for c | file://:0:0:0:0 | call to C | Standard edge, only from QL | | -| staticlocals__staticlocals_f2 | staticlocals.cpp:29:5:29:17 | declaration | file://:0:0:0:0 | initializer for c | Standard edge, only from QL | | -| staticlocals__staticlocals_f3 | staticlocals.cpp:39:3:39:34 | declaration | staticlocals.cpp:39:18:39:33 | initializer for i | Standard edge, only from QL | uninstantiated | -| staticlocals__staticlocals_f3 | staticlocals.cpp:39:18:39:33 | initializer for i | staticlocals.cpp:39:18:39:33 | value | Standard edge, only from QL | uninstantiated | -| staticlocals__staticlocals_f3 | staticlocals.cpp:39:18:39:33 | value | staticlocals.cpp:40:1:40:1 | return ... | Standard edge, only from QL | uninstantiated | diff --git a/cpp/ql/test/library-tests/syntax-zoo/tellDifferent.ql b/cpp/ql/test/library-tests/syntax-zoo/tellDifferent.ql deleted file mode 100644 index f4b2509c17b1..000000000000 --- a/cpp/ql/test/library-tests/syntax-zoo/tellDifferent.ql +++ /dev/null @@ -1,13 +0,0 @@ -import Compare - -string describeTemplate(ControlFlowNode node) { - node.isFromTemplateInstantiation(_) and - result = "instantiation" - or - node.isFromUninstantiatedTemplate(_) and - result = "uninstantiated" -} - -from ControlFlowNode n1, ControlFlowNode n2, string msg -where differentEdge(n1, n2, msg) -select getScopeName(n1), n1, n2, msg, concat(describeTemplate(n1), ", ")