C++: Accept test changes.

Author: MathiasVP

cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected

@@ -855,10 +855,18 @@
 | test.cpp:248:6:248:11 | ... != ... | b != 2+0 when ... != ... is true |
 | test.cpp:248:6:248:11 | ... != ... | b == 2 when ... != ... is false |
 | test.cpp:248:6:248:11 | ... != ... | b == 2+0 when ... != ... is false |
+| test.cpp:248:6:248:11 | ... != ... | m < n+1 when ... != ... is true |
+| test.cpp:248:6:248:11 | ... != ... | m >= n+1 when ... != ... is false |
+| test.cpp:248:6:248:11 | ... != ... | n < m+0 when ... != ... is false |
+| test.cpp:248:6:248:11 | ... != ... | n >= m+0 when ... != ... is true |
 | test.cpp:257:6:257:6 | b | b != 0 when b is true |
 | test.cpp:257:6:257:6 | b | b != 1 when b is false |
 | test.cpp:257:6:257:6 | b | b == 0 when b is false |
 | test.cpp:257:6:257:6 | b | b == 1 when b is true |
+| test.cpp:257:6:257:6 | b | m != n+0 when b is false |
+| test.cpp:257:6:257:6 | b | m == n+0 when b is true |
+| test.cpp:257:6:257:6 | b | n != m+0 when b is false |
+| test.cpp:257:6:257:6 | b | n == m+0 when b is true |
 | test.cpp:266:6:266:11 | ... != ... | 2 != b+0 when ... != ... is true |
 | test.cpp:266:6:266:11 | ... != ... | 2 == b+0 when ... != ... is false |
 | test.cpp:266:6:266:11 | ... != ... | ... != ... != 0 when ... != ... is true |
@@ -869,10 +877,18 @@
 | test.cpp:266:6:266:11 | ... != ... | b != 2+0 when ... != ... is true |
 | test.cpp:266:6:266:11 | ... != ... | b == 2 when ... != ... is false |
 | test.cpp:266:6:266:11 | ... != ... | b == 2+0 when ... != ... is false |
+| test.cpp:266:6:266:11 | ... != ... | m != n+0 when ... != ... is true |
+| test.cpp:266:6:266:11 | ... != ... | m == n+0 when ... != ... is false |
+| test.cpp:266:6:266:11 | ... != ... | n != m+0 when ... != ... is true |
+| test.cpp:266:6:266:11 | ... != ... | n == m+0 when ... != ... is false |
 | test.cpp:275:6:275:6 | b | b != 0 when b is true |
 | test.cpp:275:6:275:6 | b | b != 1 when b is false |
 | test.cpp:275:6:275:6 | b | b == 0 when b is false |
 | test.cpp:275:6:275:6 | b | b == 1 when b is true |
+| test.cpp:275:6:275:6 | b | m != n+0 when b is true |
+| test.cpp:275:6:275:6 | b | m == n+0 when b is false |
+| test.cpp:275:6:275:6 | b | n != m+0 when b is true |
+| test.cpp:275:6:275:6 | b | n == m+0 when b is false |
 | test.cpp:284:6:284:11 | ... != ... | 2 != b+0 when ... != ... is true |
 | test.cpp:284:6:284:11 | ... != ... | 2 == b+0 when ... != ... is false |
 | test.cpp:284:6:284:11 | ... != ... | ... != ... != 0 when ... != ... is true |
@@ -883,3 +899,7 @@
 | test.cpp:284:6:284:11 | ... != ... | b != 2+0 when ... != ... is true |
 | test.cpp:284:6:284:11 | ... != ... | b == 2 when ... != ... is false |
 | test.cpp:284:6:284:11 | ... != ... | b == 2+0 when ... != ... is false |
+| test.cpp:284:6:284:11 | ... != ... | m != n+0 when ... != ... is false |
+| test.cpp:284:6:284:11 | ... != ... | m == n+0 when ... != ... is true |
+| test.cpp:284:6:284:11 | ... != ... | n != m+0 when ... != ... is false |
+| test.cpp:284:6:284:11 | ... != ... | n == m+0 when ... != ... is true |

cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected

@@ -323,14 +323,34 @@ binary
 | test.cpp:241:35:241:43 | ... == ... | test.cpp:241:17:241:17 | 0 | == | test.cpp:241:12:241:12 | i | 0 | test.cpp:241:46:242:13 | { ... } |
 | test.cpp:241:35:241:43 | ... == ... | test.cpp:241:38:241:38 | i | == | test.cpp:241:43:241:43 | 0 | 0 | test.cpp:241:46:242:13 | { ... } |
 | test.cpp:241:35:241:43 | ... == ... | test.cpp:241:43:241:43 | 0 | == | test.cpp:241:38:241:38 | i | 0 | test.cpp:241:46:242:13 | { ... } |
+| test.cpp:248:6:248:11 | ... != ... | test.cpp:247:11:247:11 | n | < | test.cpp:247:15:247:15 | m | 0 | test.cpp:250:10:252:3 | { ... } |
+| test.cpp:248:6:248:11 | ... != ... | test.cpp:247:11:247:11 | n | >= | test.cpp:247:15:247:15 | m | 0 | test.cpp:248:14:250:3 | { ... } |
+| test.cpp:248:6:248:11 | ... != ... | test.cpp:247:15:247:15 | m | < | test.cpp:247:11:247:11 | n | 1 | test.cpp:248:14:250:3 | { ... } |
+| test.cpp:248:6:248:11 | ... != ... | test.cpp:247:15:247:15 | m | >= | test.cpp:247:11:247:11 | n | 1 | test.cpp:250:10:252:3 | { ... } |
 | test.cpp:248:6:248:11 | ... != ... | test.cpp:248:6:248:6 | b | != | test.cpp:248:11:248:11 | 2 | 0 | test.cpp:248:14:250:3 | { ... } |
 | test.cpp:248:6:248:11 | ... != ... | test.cpp:248:6:248:6 | b | == | test.cpp:248:11:248:11 | 2 | 0 | test.cpp:250:10:252:3 | { ... } |
 | test.cpp:248:6:248:11 | ... != ... | test.cpp:248:11:248:11 | 2 | != | test.cpp:248:6:248:6 | b | 0 | test.cpp:248:14:250:3 | { ... } |
 | test.cpp:248:6:248:11 | ... != ... | test.cpp:248:11:248:11 | 2 | == | test.cpp:248:6:248:6 | b | 0 | test.cpp:250:10:252:3 | { ... } |
+| test.cpp:257:6:257:6 | b | test.cpp:256:11:256:11 | n | != | test.cpp:256:16:256:16 | m | 0 | test.cpp:259:10:261:3 | { ... } |
+| test.cpp:257:6:257:6 | b | test.cpp:256:11:256:11 | n | == | test.cpp:256:16:256:16 | m | 0 | test.cpp:257:9:259:3 | { ... } |
+| test.cpp:257:6:257:6 | b | test.cpp:256:16:256:16 | m | != | test.cpp:256:11:256:11 | n | 0 | test.cpp:259:10:261:3 | { ... } |
+| test.cpp:257:6:257:6 | b | test.cpp:256:16:256:16 | m | == | test.cpp:256:11:256:11 | n | 0 | test.cpp:257:9:259:3 | { ... } |
+| test.cpp:266:6:266:11 | ... != ... | test.cpp:265:11:265:11 | n | != | test.cpp:265:16:265:16 | m | 0 | test.cpp:266:14:268:3 | { ... } |
+| test.cpp:266:6:266:11 | ... != ... | test.cpp:265:11:265:11 | n | == | test.cpp:265:16:265:16 | m | 0 | test.cpp:268:10:270:3 | { ... } |
+| test.cpp:266:6:266:11 | ... != ... | test.cpp:265:16:265:16 | m | != | test.cpp:265:11:265:11 | n | 0 | test.cpp:266:14:268:3 | { ... } |
+| test.cpp:266:6:266:11 | ... != ... | test.cpp:265:16:265:16 | m | == | test.cpp:265:11:265:11 | n | 0 | test.cpp:268:10:270:3 | { ... } |
 | test.cpp:266:6:266:11 | ... != ... | test.cpp:266:6:266:6 | b | != | test.cpp:266:11:266:11 | 2 | 0 | test.cpp:266:14:268:3 | { ... } |
 | test.cpp:266:6:266:11 | ... != ... | test.cpp:266:6:266:6 | b | == | test.cpp:266:11:266:11 | 2 | 0 | test.cpp:268:10:270:3 | { ... } |
 | test.cpp:266:6:266:11 | ... != ... | test.cpp:266:11:266:11 | 2 | != | test.cpp:266:6:266:6 | b | 0 | test.cpp:266:14:268:3 | { ... } |
 | test.cpp:266:6:266:11 | ... != ... | test.cpp:266:11:266:11 | 2 | == | test.cpp:266:6:266:6 | b | 0 | test.cpp:268:10:270:3 | { ... } |
+| test.cpp:275:6:275:6 | b | test.cpp:274:11:274:11 | n | != | test.cpp:274:16:274:16 | m | 0 | test.cpp:275:9:277:3 | { ... } |
+| test.cpp:275:6:275:6 | b | test.cpp:274:11:274:11 | n | == | test.cpp:274:16:274:16 | m | 0 | test.cpp:277:10:279:3 | { ... } |
+| test.cpp:275:6:275:6 | b | test.cpp:274:16:274:16 | m | != | test.cpp:274:11:274:11 | n | 0 | test.cpp:275:9:277:3 | { ... } |
+| test.cpp:275:6:275:6 | b | test.cpp:274:16:274:16 | m | == | test.cpp:274:11:274:11 | n | 0 | test.cpp:277:10:279:3 | { ... } |
+| test.cpp:284:6:284:11 | ... != ... | test.cpp:283:11:283:11 | n | != | test.cpp:283:16:283:16 | m | 0 | test.cpp:286:10:288:3 | { ... } |
+| test.cpp:284:6:284:11 | ... != ... | test.cpp:283:11:283:11 | n | == | test.cpp:283:16:283:16 | m | 0 | test.cpp:284:14:286:3 | { ... } |
+| test.cpp:284:6:284:11 | ... != ... | test.cpp:283:16:283:16 | m | != | test.cpp:283:11:283:11 | n | 0 | test.cpp:286:10:288:3 | { ... } |
+| test.cpp:284:6:284:11 | ... != ... | test.cpp:283:16:283:16 | m | == | test.cpp:283:11:283:11 | n | 0 | test.cpp:284:14:286:3 | { ... } |
 | test.cpp:284:6:284:11 | ... != ... | test.cpp:284:6:284:6 | b | != | test.cpp:284:11:284:11 | 2 | 0 | test.cpp:284:14:286:3 | { ... } |
 | test.cpp:284:6:284:11 | ... != ... | test.cpp:284:6:284:6 | b | == | test.cpp:284:11:284:11 | 2 | 0 | test.cpp:286:10:288:3 | { ... } |
 | test.cpp:284:6:284:11 | ... != ... | test.cpp:284:11:284:11 | 2 | != | test.cpp:284:6:284:6 | b | 0 | test.cpp:284:14:286:3 | { ... } |