C++: Simplify test queries

Author: jketema

cpp/ql/test/library-tests/builtins/builtins/expr.expected

@@ -31,6 +31,7 @@
 | choose_expr.c:3:35:3:35 | 1 |  | 1 |
 | choose_expr.c:3:38:3:38 | 5 |  | 5 |
 | choose_expr.c:3:41:3:41 | 6 |  | 6 |
+| spaceship.cpp:6:45:6:45 | n | this | <none> |
 | spaceship.cpp:6:45:6:45 | this |  | <none> |
 | spaceship.cpp:9:53:9:56 | {...} | - ... | <none> |
 | spaceship.cpp:9:54:9:55 | - ... | 1 | -1 |
@@ -42,6 +43,7 @@
 | spaceship.cpp:18:12:18:14 | rhs |  | <none> |
 | spaceship.cpp:18:12:18:24 | ... <=> ... | rhs,i | <none> |
 | spaceship.cpp:18:20:18:22 | lhs |  | <none> |
+| spaceship.cpp:18:24:18:24 | i | lhs | <none> |
 | spaceship.cpp:22:41:22:101 | __builtin_lt_synthesizes_from_spaceship | const S &,const int & | 1 |
 | spaceship.cpp:22:41:22:101 | const S & |  | <none> |
 | spaceship.cpp:22:41:22:101 | const int & |  | <none> |

cpp/ql/test/library-tests/builtins/builtins/expr.ql

@@ -1,15 +1,5 @@
 import cpp
 
-string childrenFrom(Expr e, int i) {
-  (
-    if i = 0
-    then result = e.getChild(i).toString() + childrenFrom(e, i + 1)
-    else result = "," + e.getChild(i).toString() + childrenFrom(e, i + 1)
-  )
-  or
-  i = e.getNumChild() and result = ""
-}
-
 from Expr e, string value
 where if exists(e.getValue()) then value = e.getValue().toString() else value = "<none>"
-select e, childrenFrom(e, 0), value
+select e, concat(int i | | e.getChild(i).toString(), "," order by i), value

cpp/ql/test/library-tests/builtins/type_traits/expr.ql

@@ -1,15 +1,5 @@
 import cpp
 
-string childrenFrom(Expr e, int i) {
-  (
-    if i = 0
-    then result = e.getChild(i).toString() + childrenFrom(e, i + 1)
-    else result = "," + e.getChild(i).toString() + childrenFrom(e, i + 1)
-  )
-  or
-  i = e.getNumChild() and result = ""
-}
-
 from Expr e, string value
 where if exists(e.getValue()) then value = e.getValue().toString() else value = "<none>"
-select e, childrenFrom(e, 0), value
+select e, concat(int i | | e.getChild(i).toString(), "," order by i), value