C++: Accept test changes.

Author: MathiasVP

Diff for: cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected

@@ -26,6 +26,7 @@ astGuards
 | test.c:131:7:131:7 | b |
 | test.c:137:7:137:7 | 0 |
 | test.c:146:7:146:8 | ! ... |
+| test.c:146:8:146:8 | x |
 | test.c:152:10:152:10 | x |
 | test.c:152:10:152:15 | ... && ... |
 | test.c:152:15:152:15 | y |
@@ -266,7 +267,9 @@ astGuardsCompare
 | 146 | ! ... == 0 when ! ... is false |
 | 146 | ! ... == 1 when ! ... is true |
 | 146 | x != 0 when ! ... is false |
+| 146 | x != 0 when x is true |
 | 146 | x == 0 when ! ... is true |
+| 146 | x == 0 when x is false |
 | 152 | x != 0 when ... && ... is true |
 | 152 | x != 0 when x is true |
 | 152 | x != 1 when x is false |
@@ -422,6 +425,7 @@ astGuardsControl
 | test.c:131:7:131:7 | b | true | 131 | 132 |
 | test.c:137:7:137:7 | 0 | false | 142 | 136 |
 | test.c:146:7:146:8 | ! ... | true | 146 | 147 |
+| test.c:146:8:146:8 | x | false | 146 | 147 |
 | test.c:152:10:152:10 | x | true | 151 | 152 |
 | test.c:152:10:152:10 | x | true | 152 | 152 |
 | test.c:152:10:152:15 | ... && ... | true | 151 | 152 |
@@ -837,6 +841,7 @@ astGuardsEnsure_const
 | test.c:146:7:146:8 | ! ... | test.c:146:7:146:8 | ! ... | != | 0 | 146 | 147 |
 | test.c:146:7:146:8 | ! ... | test.c:146:7:146:8 | ! ... | == | 1 | 146 | 147 |
 | test.c:146:7:146:8 | ! ... | test.c:146:8:146:8 | x | == | 0 | 146 | 147 |
+| test.c:146:8:146:8 | x | test.c:146:8:146:8 | x | == | 0 | 146 | 147 |
 | test.c:152:10:152:10 | x | test.c:152:10:152:10 | x | != | 0 | 151 | 152 |
 | test.c:152:10:152:10 | x | test.c:152:10:152:10 | x | != | 0 | 152 | 152 |
 | test.c:152:10:152:10 | x | test.c:152:10:152:10 | x | == | 1 | 151 | 152 |

Diff for: cpp/ql/test/library-tests/controlflow/guards/Guards.expected

@@ -25,10 +25,13 @@
 | test.c:131:7:131:7 | b |
 | test.c:137:7:137:7 | 0 |
 | test.c:146:7:146:8 | ! ... |
+| test.c:146:8:146:8 | x |
 | test.c:152:8:152:8 | p |
 | test.c:158:8:158:9 | ! ... |
+| test.c:158:9:158:9 | p |
 | test.c:164:8:164:8 | s |
 | test.c:170:8:170:9 | ! ... |
+| test.c:170:9:170:9 | s |
 | test.cpp:18:8:18:10 | call to get |
 | test.cpp:31:7:31:13 | ... == ... |
 | test.cpp:42:13:42:20 | call to getABool |

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

@@ -342,7 +342,9 @@
 | 146 | ! ... == 0 when ! ... is false |
 | 146 | ! ... == 1 when ! ... is true |
 | 146 | x != 0 when ! ... is false |
+| 146 | x != 0 when x is true |
 | 146 | x == 0 when ! ... is true |
+| 146 | x == 0 when x is false |
 | 152 | p != 0 when p is true |
 | 152 | p != 1 when p is false |
 | 152 | p == 0 when p is false |
@@ -352,7 +354,9 @@
 | 158 | ! ... == 0 when ! ... is false |
 | 158 | ! ... == 1 when ! ... is true |
 | 158 | p != 0 when ! ... is false |
+| 158 | p != 0 when p is true |
 | 158 | p == 0 when ! ... is true |
+| 158 | p == 0 when p is false |
 | 164 | s != 0 when s is true |
 | 164 | s != 1 when s is false |
 | 164 | s == 0 when s is false |
@@ -362,4 +366,6 @@
 | 170 | ! ... == 0 when ! ... is false |
 | 170 | ! ... == 1 when ! ... is true |
 | 170 | s != 0 when ! ... is false |
+| 170 | s != 0 when s is true |
 | 170 | s == 0 when ! ... is true |
+| 170 | s == 0 when s is false |

Diff for: cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected

@@ -78,10 +78,13 @@
 | test.c:131:7:131:7 | b | true | 131 | 132 |
 | test.c:137:7:137:7 | 0 | false | 142 | 136 |
 | test.c:146:7:146:8 | ! ... | true | 146 | 147 |
+| test.c:146:8:146:8 | x | false | 146 | 147 |
 | test.c:152:8:152:8 | p | true | 152 | 154 |
 | test.c:158:8:158:9 | ! ... | true | 158 | 160 |
+| test.c:158:9:158:9 | p | false | 158 | 160 |
 | test.c:164:8:164:8 | s | true | 164 | 166 |
 | test.c:170:8:170:9 | ! ... | true | 170 | 172 |
+| test.c:170:9:170:9 | s | false | 170 | 172 |
 | test.cpp:18:8:18:10 | call to get | true | 19 | 19 |
 | test.cpp:31:7:31:13 | ... == ... | false | 30 | 30 |
 | test.cpp:31:7:31:13 | ... == ... | false | 34 | 34 |

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

@@ -442,16 +442,19 @@ unary
 | test.c:146:7:146:8 | ! ... | test.c:146:7:146:8 | ! ... | != | 0 | 146 | 147 |
 | test.c:146:7:146:8 | ! ... | test.c:146:7:146:8 | ! ... | == | 1 | 146 | 147 |
 | test.c:146:7:146:8 | ! ... | test.c:146:8:146:8 | x | == | 0 | 146 | 147 |
+| test.c:146:8:146:8 | x | test.c:146:8:146:8 | x | == | 0 | 146 | 147 |
 | test.c:152:8:152:8 | p | test.c:152:8:152:8 | p | != | 0 | 152 | 154 |
 | test.c:152:8:152:8 | p | test.c:152:8:152:8 | p | == | 1 | 152 | 154 |
 | test.c:158:8:158:9 | ! ... | test.c:158:8:158:9 | ! ... | != | 0 | 158 | 160 |
 | test.c:158:8:158:9 | ! ... | test.c:158:8:158:9 | ! ... | == | 1 | 158 | 160 |
 | test.c:158:8:158:9 | ! ... | test.c:158:9:158:9 | p | == | 0 | 158 | 160 |
+| test.c:158:9:158:9 | p | test.c:158:9:158:9 | p | == | 0 | 158 | 160 |
 | test.c:164:8:164:8 | s | test.c:164:8:164:8 | s | != | 0 | 164 | 166 |
 | test.c:164:8:164:8 | s | test.c:164:8:164:8 | s | == | 1 | 164 | 166 |
 | test.c:170:8:170:9 | ! ... | test.c:170:8:170:9 | ! ... | != | 0 | 170 | 172 |
 | test.c:170:8:170:9 | ! ... | test.c:170:8:170:9 | ! ... | == | 1 | 170 | 172 |
 | test.c:170:8:170:9 | ! ... | test.c:170:9:170:9 | s | == | 0 | 170 | 172 |
+| test.c:170:9:170:9 | s | test.c:170:9:170:9 | s | == | 0 | 170 | 172 |
 | test.cpp:18:8:18:10 | call to get | test.cpp:18:8:18:10 | call to get | != | 0 | 19 | 19 |
 | test.cpp:18:8:18:10 | call to get | test.cpp:18:8:18:10 | call to get | == | 1 | 19 | 19 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | != | -1 | 30 | 30 |