Skip to content

Commit 1e6d740

Browse files
authored
fix(cpp1): flank == with spaces to preserve meaning (#617)
* test: add `pure2-bugfix-for-max-munch` * fix(cpp1): flank `==` with spaces to preserve meaning * test: refactor to prevent warnings * refactor: regenerate `reflect.h` and `regression-tests`
1 parent 8f8abde commit 1e6d740

17 files changed

+74
-45
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
v: <T> == 0;
2+
main: () = _ = v<i32> == v<i64>;

regression-tests/test-results/clang-18/pure2-bugfix-for-max-munch.cpp.execution

Whitespace-only changes.

regression-tests/test-results/clang-18/pure2-bugfix-for-max-munch.cpp.output

Whitespace-only changes.

regression-tests/test-results/mixed-bugfix-for-literal-as-nttp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ auto main() -> int;
2020

2121
#line 3 "mixed-bugfix-for-literal-as-nttp.cpp2"
2222
auto main() -> int{
23-
cpp2::Default.expects(cpp2::as_<cpp2::i32, 10>()==10, "");
24-
cpp2::Default.expects(cpp2::as_<cpp2::i32, 10LL>()==10, "");
25-
cpp2::Default.expects(cpp2::as_<std::chrono::seconds>(10s)==10s, "");
23+
cpp2::Default.expects(cpp2::as_<cpp2::i32, 10>() == 10, "");
24+
cpp2::Default.expects(cpp2::as_<cpp2::i32, 10LL>() == 10, "");
25+
cpp2::Default.expects(cpp2::as_<std::chrono::seconds>(10s) == 10s, "");
2626
}
2727

regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
4646
#line 22 "mixed-captures-in-expressions-and-postconditions.cpp2"
4747
{
4848
cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS_0(ssize, vec)), "");
49-
auto post_21_5 = cpp2::finally_success([_0 = CPP2_UFCS_0(ssize, vec)]{cpp2::Default.expects(CPP2_UFCS_0(ssize, vec)==_0 + 1, "");} );
49+
auto post_21_5 = cpp2::finally_success([_0 = CPP2_UFCS_0(ssize, vec)]{cpp2::Default.expects(CPP2_UFCS_0(ssize, vec) == _0 + 1, "");} );
5050
#line 23 "mixed-captures-in-expressions-and-postconditions.cpp2"
5151
static_cast<void>(CPP2_UFCS(insert, vec, CPP2_UFCS_0(begin, vec) + where, val));
5252
}

regression-tests/test-results/mixed-initialization-safety-3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ auto fill(
6262
auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n"; }
6363

6464
#line 30 "mixed-initialization-safety-3.cpp2"
65-
[[nodiscard]] auto flip_a_coin() -> bool { return std::mt19937()() % 2==0; }
65+
[[nodiscard]] auto flip_a_coin() -> bool { return std::mt19937()() % 2 == 0; }
6666

regression-tests/test-results/mixed-parameter-passing-with-forward.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ requires (std::is_same_v<CPP2_TYPEOF(e), std::string>)
6868

6969
copy_from(z);
7070

71-
if (std::time(nullptr) % 2==0) {
71+
if (std::time(nullptr) % 2 == 0) {
7272
copy_from(std::move(z));
7373
}
7474

regression-tests/test-results/mixed-parameter-passing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ auto parameter_styles(
6060

6161
copy_from(z);
6262

63-
if (std::time(nullptr) % 2==0) {
63+
if (std::time(nullptr) % 2 == 0) {
6464
copy_from(std::move(z));
6565
}
6666

regression-tests/test-results/mixed-postexpression-with-capture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
4141
#line 17 "mixed-postexpression-with-capture.cpp2"
4242
{
4343
cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS_0(ssize, vec)), "");
44-
auto post_16_5 = cpp2::finally_success([_0 = CPP2_UFCS_0(size, vec)]{cpp2::Default.expects(CPP2_UFCS_0(size, vec)==_0 + 1, "");} );
44+
auto post_16_5 = cpp2::finally_success([_0 = CPP2_UFCS_0(size, vec)]{cpp2::Default.expects(CPP2_UFCS_0(size, vec) == _0 + 1, "");} );
4545
#line 18 "mixed-postexpression-with-capture.cpp2"
4646
CPP2_UFCS(push_back, vec, val);
4747
}

regression-tests/test-results/pure2-break-continue.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ auto while_continue_inner() -> void
8282
#line 25 "pure2-break-continue.cpp2"
8383
{
8484
std::cout << i << j << " ";
85-
if (j==1) {
85+
if (j == 1) {
8686
goto CONTINUE_25_9;
8787
}
8888
std::cout << "inner ";
@@ -101,7 +101,7 @@ auto while_continue_outer() -> void
101101
auto j {0};
102102
for( ; cpp2::cmp_less(j,3); ++j ) {
103103
std::cout << i << j << " ";
104-
if (j==1) {
104+
if (j == 1) {
105105
goto CONTINUE_39_5;
106106
}
107107
std::cout << "inner ";
@@ -120,7 +120,7 @@ auto while_break_inner() -> void
120120
#line 57 "pure2-break-continue.cpp2"
121121
{
122122
std::cout << i << j << " ";
123-
if (j==1) {
123+
if (j == 1) {
124124
goto BREAK_57_9;
125125
}
126126
std::cout << "inner ";
@@ -139,7 +139,7 @@ auto while_break_outer() -> void
139139
auto j {0};
140140
for( ; cpp2::cmp_less(j,3); ++j ) {
141141
std::cout << i << j << " ";
142-
if (j==1) {
142+
if (j == 1) {
143143
goto BREAK_71_5;
144144
}
145145
std::cout << "inner ";
@@ -158,7 +158,7 @@ auto do_continue_inner() -> void
158158
#line 89 "pure2-break-continue.cpp2"
159159
{
160160
std::cout << i << j << " ";
161-
if (j==1) {
161+
if (j == 1) {
162162
goto CONTINUE_89_9;
163163
}
164164
std::cout << "inner ";
@@ -183,7 +183,7 @@ auto do_continue_outer() -> void
183183
auto j {0};
184184
do {
185185
std::cout << i << j << " ";
186-
if (j==1) {
186+
if (j == 1) {
187187
goto CONTINUE_106_5;
188188
}
189189
std::cout << "inner ";
@@ -208,7 +208,7 @@ auto do_break_inner() -> void
208208
#line 127 "pure2-break-continue.cpp2"
209209
{
210210
std::cout << i << j << " ";
211-
if (j==1) {
211+
if (j == 1) {
212212
goto BREAK_127_9;
213213
}
214214
std::cout << "inner ";
@@ -233,7 +233,7 @@ auto do_break_outer() -> void
233233
auto j {0};
234234
do {
235235
std::cout << i << j << " ";
236-
if (j==1) {
236+
if (j == 1) {
237237
goto BREAK_144_5;
238238
}
239239
std::cout << "inner ";
@@ -259,7 +259,7 @@ auto for_continue_inner() -> void
259259
#line 166 "pure2-break-continue.cpp2"
260260
{
261261
std::cout << i << j << " ";
262-
if (j==1) {
262+
if (j == 1) {
263263
goto CONTINUE_166_9;
264264
}
265265
std::cout << "inner ";
@@ -280,7 +280,7 @@ auto for_continue_outer() -> void
280280
std::vector vj {0, 1, 2};
281281
for ( auto const& j : vj ) {
282282
std::cout << i << j << " ";
283-
if (j==1) {
283+
if (j == 1) {
284284
goto CONTINUE_182_5;
285285
}
286286
std::cout << "inner ";
@@ -301,7 +301,7 @@ auto for_break_inner() -> void
301301
#line 202 "pure2-break-continue.cpp2"
302302
{
303303
std::cout << i << j << " ";
304-
if (j==1) {
304+
if (j == 1) {
305305
goto BREAK_202_9;
306306
}
307307
std::cout << "inner ";
@@ -322,7 +322,7 @@ auto for_break_outer() -> void
322322
std::vector vj {0, 1, 2};
323323
for ( auto const& j : vj ) {
324324
std::cout << i << j << " ";
325-
if (j==1) {
325+
if (j == 1) {
326326
goto BREAK_218_5;
327327
}
328328
std::cout << "inner ";

0 commit comments

Comments
 (0)