Skip to content

Commit 14317c9

Browse files
e-kwsme-kwsm
committed
refactor(test): use static_assert (C11, C++11)
1 parent d899a71 commit 14317c9

28 files changed

+1216
-1238
lines changed

‎test/arithmetic.cxx

+170-170
Large diffs are not rendered by default.

‎test/array.cxx

+190-190
Large diffs are not rendered by default.

‎test/checkempty.cxx

+19-19
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@
3535
#define ATUPLE (atuple)
3636
#define ATUPLE_PLUS (atuple) data
3737

38-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN) == 0 END
39-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN2) == 0 END
40-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN3) == 0 END
41-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN4) == 0 END
42-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN5) == 0 END
43-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN8) == 0 END
44-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN9) == 0 END
45-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN10) == 0 END
46-
BEGIN BOOST_PP_CHECK_EMPTY(BOOST_PP_EMPTY()) == 1 END
47-
BEGIN BOOST_PP_CHECK_EMPTY(DATA BOOST_PP_EMPTY()) == 1 END
48-
BEGIN BOOST_PP_CHECK_EMPTY(x BOOST_PP_EMPTY()) == 0 END
49-
BEGIN BOOST_PP_CHECK_EMPTY(OBJECT BOOST_PP_EMPTY()) == 1 END
50-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC(z) BOOST_PP_EMPTY()) == 1 END
51-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN6) == 0 END
52-
BEGIN BOOST_PP_CHECK_EMPTY(FUNC_GEN7) == 0 END
53-
BEGIN BOOST_PP_CHECK_EMPTY(NAME) == 0 END
54-
BEGIN BOOST_PP_CHECK_EMPTY(ATUPLE) == 0 END
55-
BEGIN BOOST_PP_CHECK_EMPTY(ATUPLE_PLUS) == 0 END
38+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN) == 0, "");
39+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN2) == 0, "");
40+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN3) == 0, "");
41+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN4) == 0, "");
42+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN5) == 0, "");
43+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN8) == 0, "");
44+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN9) == 0, "");
45+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN10) == 0, "");
46+
static_assert(BOOST_PP_CHECK_EMPTY(BOOST_PP_EMPTY()) == 1, "");
47+
static_assert(BOOST_PP_CHECK_EMPTY(DATA BOOST_PP_EMPTY()) == 1, "");
48+
static_assert(BOOST_PP_CHECK_EMPTY(x BOOST_PP_EMPTY()) == 0, "");
49+
static_assert(BOOST_PP_CHECK_EMPTY(OBJECT BOOST_PP_EMPTY()) == 1, "");
50+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC(z) BOOST_PP_EMPTY()) == 1, "");
51+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN6) == 0, "");
52+
static_assert(BOOST_PP_CHECK_EMPTY(FUNC_GEN7) == 0, "");
53+
static_assert(BOOST_PP_CHECK_EMPTY(NAME) == 0, "");
54+
static_assert(BOOST_PP_CHECK_EMPTY(ATUPLE) == 0, "");
55+
static_assert(BOOST_PP_CHECK_EMPTY(ATUPLE_PLUS) == 0, "");
5656

5757
# else
5858

59-
BEGIN 1 == 1 END
59+
static_assert(1 == 1, "");
6060

6161
# endif

‎test/clang_cuda.cu

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
#
1010
# /* See http://www.boost.org for most recent version. */
1111
#
12-
# include "test_macro.h"
1312

1413
#if defined(__clang__) && defined(__CUDACC__) && defined(__CUDA__)
1514

16-
BEGIN BOOST_PP_VARIADICS == 1 END
15+
static_assert(BOOST_PP_VARIADICS == 1, "");
1716

1817
#else
1918

20-
BEGIN 0 == 1 END
19+
static_assert(0 == 1, "");
2120

2221
#endif
2322

‎test/comparison.cxx

+44-44
Original file line numberDiff line numberDiff line change
@@ -15,122 +15,122 @@
1515

1616
/* equality */
1717

18-
BEGIN BOOST_PP_EQUAL(2, 0) == 0 END
19-
BEGIN BOOST_PP_EQUAL(2, 2) == 1 END
18+
static_assert(BOOST_PP_EQUAL(2, 0) == 0, "");
19+
static_assert(BOOST_PP_EQUAL(2, 2) == 1, "");
2020

2121
#if BOOST_PP_LIMIT_MAG == 512
2222

23-
BEGIN BOOST_PP_EQUAL(135, 487) == 0 END
24-
BEGIN BOOST_PP_EQUAL(367, 367) == 1 END
23+
static_assert(BOOST_PP_EQUAL(135, 487) == 0, "");
24+
static_assert(BOOST_PP_EQUAL(367, 367) == 1, "");
2525

2626
#endif
2727

2828
#if BOOST_PP_LIMIT_MAG == 1024
2929

30-
BEGIN BOOST_PP_EQUAL(749, 832) == 0 END
31-
BEGIN BOOST_PP_EQUAL(955, 955) == 1 END
30+
static_assert(BOOST_PP_EQUAL(749, 832) == 0, "");
31+
static_assert(BOOST_PP_EQUAL(955, 955) == 1, "");
3232

3333
#endif
3434

3535
/* inequality */
3636

37-
BEGIN BOOST_PP_NOT_EQUAL(2, 0) == 1 END
38-
BEGIN BOOST_PP_NOT_EQUAL(2, 2) == 0 END
37+
static_assert(BOOST_PP_NOT_EQUAL(2, 0) == 1, "");
38+
static_assert(BOOST_PP_NOT_EQUAL(2, 2) == 0, "");
3939

4040
#if BOOST_PP_LIMIT_MAG == 512
4141

42-
BEGIN BOOST_PP_NOT_EQUAL(375, 126) == 1 END
43-
BEGIN BOOST_PP_NOT_EQUAL(439, 439) == 0 END
42+
static_assert(BOOST_PP_NOT_EQUAL(375, 126) == 1, "");
43+
static_assert(BOOST_PP_NOT_EQUAL(439, 439) == 0, "");
4444

4545
#endif
4646

4747
#if BOOST_PP_LIMIT_MAG == 1024
4848

49-
BEGIN BOOST_PP_NOT_EQUAL(684, 674) == 1 END
50-
BEGIN BOOST_PP_NOT_EQUAL(1011, 1011) == 0 END
49+
static_assert(BOOST_PP_NOT_EQUAL(684, 674) == 1, "");
50+
static_assert(BOOST_PP_NOT_EQUAL(1011, 1011) == 0, "");
5151

5252
#endif
5353

5454
/* less */
5555

56-
BEGIN BOOST_PP_LESS(2, 1) == 0 END
57-
BEGIN BOOST_PP_LESS(1, 2) == 1 END
56+
static_assert(BOOST_PP_LESS(2, 1) == 0, "");
57+
static_assert(BOOST_PP_LESS(1, 2) == 1, "");
5858

5959
#if BOOST_PP_LIMIT_MAG == 512
6060

61-
BEGIN BOOST_PP_LESS(265, 241) == 0 END
62-
BEGIN BOOST_PP_LESS(510, 511) == 1 END
61+
static_assert(BOOST_PP_LESS(265, 241) == 0, "");
62+
static_assert(BOOST_PP_LESS(510, 511) == 1, "");
6363

6464
#endif
6565

6666
#if BOOST_PP_LIMIT_MAG == 1024
6767

68-
BEGIN BOOST_PP_LESS(753, 629) == 0 END
69-
BEGIN BOOST_PP_LESS(1022, 1024) == 1 END
68+
static_assert(BOOST_PP_LESS(753, 629) == 0, "");
69+
static_assert(BOOST_PP_LESS(1022, 1024) == 1, "");
7070

7171
#endif
7272

7373
/* less_equal */
7474

75-
BEGIN BOOST_PP_LESS_EQUAL(2, 1) == 0 END
76-
BEGIN BOOST_PP_LESS_EQUAL(1, 2) == 1 END
77-
BEGIN BOOST_PP_LESS_EQUAL(2, 2) == 1 END
75+
static_assert(BOOST_PP_LESS_EQUAL(2, 1) == 0, "");
76+
static_assert(BOOST_PP_LESS_EQUAL(1, 2) == 1, "");
77+
static_assert(BOOST_PP_LESS_EQUAL(2, 2) == 1, "");
7878

7979
#if BOOST_PP_LIMIT_MAG == 512
8080

81-
BEGIN BOOST_PP_LESS_EQUAL(327, 211) == 0 END
82-
BEGIN BOOST_PP_LESS_EQUAL(489, 502) == 1 END
83-
BEGIN BOOST_PP_LESS_EQUAL(327, 327) == 1 END
81+
static_assert(BOOST_PP_LESS_EQUAL(327, 211) == 0, "");
82+
static_assert(BOOST_PP_LESS_EQUAL(489, 502) == 1, "");
83+
static_assert(BOOST_PP_LESS_EQUAL(327, 327) == 1, "");
8484

8585
#endif
8686

8787
#if BOOST_PP_LIMIT_MAG == 1024
8888

89-
BEGIN BOOST_PP_LESS_EQUAL(951, 632) == 0 END
90-
BEGIN BOOST_PP_LESS_EQUAL(875, 1002) == 1 END
91-
BEGIN BOOST_PP_LESS_EQUAL(727, 727) == 1 END
89+
static_assert(BOOST_PP_LESS_EQUAL(951, 632) == 0, "");
90+
static_assert(BOOST_PP_LESS_EQUAL(875, 1002) == 1, "");
91+
static_assert(BOOST_PP_LESS_EQUAL(727, 727) == 1, "");
9292

9393
#endif
9494

9595
/* greater */
9696

97-
BEGIN BOOST_PP_GREATER(2, 1) == 1 END
98-
BEGIN BOOST_PP_GREATER(1, 2) == 0 END
97+
static_assert(BOOST_PP_GREATER(2, 1) == 1, "");
98+
static_assert(BOOST_PP_GREATER(1, 2) == 0, "");
9999

100100
#if BOOST_PP_LIMIT_MAG == 512
101101

102-
BEGIN BOOST_PP_GREATER(348, 259) == 1 END
103-
BEGIN BOOST_PP_GREATER(411, 411) == 0 END
104-
BEGIN BOOST_PP_GREATER(327, 373) == 0 END
102+
static_assert(BOOST_PP_GREATER(348, 259) == 1, "");
103+
static_assert(BOOST_PP_GREATER(411, 411) == 0, "");
104+
static_assert(BOOST_PP_GREATER(327, 373) == 0, "");
105105

106106
#endif
107107

108108
#if BOOST_PP_LIMIT_MAG == 1024
109109

110-
BEGIN BOOST_PP_GREATER(846, 523) == 1 END
111-
BEGIN BOOST_PP_GREATER(574, 574) == 0 END
112-
BEGIN BOOST_PP_GREATER(749, 811) == 0 END
110+
static_assert(BOOST_PP_GREATER(846, 523) == 1, "");
111+
static_assert(BOOST_PP_GREATER(574, 574) == 0, "");
112+
static_assert(BOOST_PP_GREATER(749, 811) == 0, "");
113113

114114
#endif
115115

116116
/* greater_equal */
117117

118-
BEGIN BOOST_PP_GREATER_EQUAL(2, 1) == 1 END
119-
BEGIN BOOST_PP_GREATER_EQUAL(1, 2) == 0 END
120-
BEGIN BOOST_PP_GREATER_EQUAL(2, 2) == 1 END
118+
static_assert(BOOST_PP_GREATER_EQUAL(2, 1) == 1, "");
119+
static_assert(BOOST_PP_GREATER_EQUAL(1, 2) == 0, "");
120+
static_assert(BOOST_PP_GREATER_EQUAL(2, 2) == 1, "");
121121

122122
#if BOOST_PP_LIMIT_MAG == 512
123123

124-
BEGIN BOOST_PP_GREATER_EQUAL(341, 27) == 1 END
125-
BEGIN BOOST_PP_GREATER_EQUAL(289, 470) == 0 END
126-
BEGIN BOOST_PP_GREATER_EQUAL(296, 296) == 1 END
124+
static_assert(BOOST_PP_GREATER_EQUAL(341, 27) == 1, "");
125+
static_assert(BOOST_PP_GREATER_EQUAL(289, 470) == 0, "");
126+
static_assert(BOOST_PP_GREATER_EQUAL(296, 296) == 1, "");
127127

128128
#endif
129129

130130
#if BOOST_PP_LIMIT_MAG == 1024
131131

132-
BEGIN BOOST_PP_GREATER_EQUAL(946, 852) == 1 END
133-
BEGIN BOOST_PP_GREATER_EQUAL(685, 717) == 0 END
134-
BEGIN BOOST_PP_GREATER_EQUAL(1001, 1001) == 1 END
132+
static_assert(BOOST_PP_GREATER_EQUAL(946, 852) == 1, "");
133+
static_assert(BOOST_PP_GREATER_EQUAL(685, 717) == 0, "");
134+
static_assert(BOOST_PP_GREATER_EQUAL(1001, 1001) == 1, "");
135135

136136
#endif

‎test/control.cxx

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@
1717

1818
# define TR(x) 1
1919

20-
BEGIN BOOST_PP_EXPR_IIF(0, TR)(0) == 0 END
21-
BEGIN BOOST_PP_EXPR_IIF(1, TR)(0) == 1 END
20+
static_assert(BOOST_PP_EXPR_IIF(0, TR)(0) == 0, "");
21+
static_assert(BOOST_PP_EXPR_IIF(1, TR)(0) == 1, "");
2222

23-
BEGIN BOOST_PP_EXPR_IF(3, TR)(0) == 1 END
24-
BEGIN BOOST_PP_EXPR_IF(0, TR)(0) == 0 END
23+
static_assert(BOOST_PP_EXPR_IF(3, TR)(0) == 1, "");
24+
static_assert(BOOST_PP_EXPR_IF(0, TR)(0) == 0, "");
2525

26-
BEGIN BOOST_PP_IIF(0, 1, 0) == 0 END
27-
BEGIN BOOST_PP_IIF(1, 1, 0) == 1 END
26+
static_assert(BOOST_PP_IIF(0, 1, 0) == 0, "");
27+
static_assert(BOOST_PP_IIF(1, 1, 0) == 1, "");
2828

29-
BEGIN BOOST_PP_IF(0, 1, 0) == 0 END
30-
BEGIN BOOST_PP_IF(9, 1, 0) == 1 END
29+
static_assert(BOOST_PP_IF(0, 1, 0) == 0, "");
30+
static_assert(BOOST_PP_IF(9, 1, 0) == 1, "");
3131

3232
# define PRED(d, state) state
3333
# define OP_1(d, state) BOOST_PP_DEC(state)
3434

35-
BEGIN BOOST_PP_WHILE(PRED, OP_1, 50) == 0 END
35+
static_assert(BOOST_PP_WHILE(PRED, OP_1, 50) == 0, "");
3636

3737
# define OP_2(d, state) BOOST_PP_DEC(BOOST_PP_ADD(BOOST_PP_WHILE(PRED, OP_1, state), state))
3838
# define OP_3(d, state) BOOST_PP_DEC(BOOST_PP_ADD_D(d, BOOST_PP_WHILE_ ## d(PRED, OP_1, state), state))
3939

40-
BEGIN BOOST_PP_WHILE(PRED, OP_2, 10) == 0 END
41-
BEGIN BOOST_PP_WHILE(PRED, OP_3, 10) == 0 END
40+
static_assert(BOOST_PP_WHILE(PRED, OP_2, 10) == 0, "");
41+
static_assert(BOOST_PP_WHILE(PRED, OP_3, 10) == 0, "");
4242

4343
#if BOOST_PP_LIMIT_MAG != 256
4444

45-
BEGIN BOOST_PP_WHILE(PRED, OP_1, BOOST_PP_LIMIT_MAG) == 0 END
45+
static_assert(BOOST_PP_WHILE(PRED, OP_1, BOOST_PP_LIMIT_MAG) == 0, "");
4646

4747
#endif

‎test/debug.cxx

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# include <boost/preprocessor/debug.hpp>
1313
# include "test.h"
1414

15-
BEGIN sizeof(BOOST_PP_ASSERT_MSG(0, "text") "") / sizeof(char) != 1 END
16-
BEGIN sizeof(BOOST_PP_ASSERT_MSG(1, "text") "") / sizeof(char) == 1 END
15+
static_assert(sizeof(BOOST_PP_ASSERT_MSG(0, "text") "") / sizeof(char) != 1, "");
16+
static_assert(sizeof(BOOST_PP_ASSERT_MSG(1, "text") "") / sizeof(char) == 1, "");
1717

1818
BOOST_PP_ASSERT(10)
1919

2020
# line BOOST_PP_LINE(100, __FILE__)
21-
BEGIN __LINE__ == 100 END
21+
static_assert(__LINE__ == 100, "");

‎test/facilities.cxx

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
# include <boost/preprocessor/arithmetic/mul.hpp>
1616
# include "test.h"
1717

18-
BEGIN BOOST_PP_APPLY(BOOST_PP_NIL) 0 == 0 END
19-
BEGIN BOOST_PP_APPLY((0)) == 0 END
18+
static_assert(BOOST_PP_APPLY(BOOST_PP_NIL) 0 == 0, "");
19+
static_assert(BOOST_PP_APPLY((0)) == 0, "");
2020

21-
BEGIN BOOST_PP_APPLY((BOOST_PP_EMPTY))() 0 == 0 END
21+
static_assert(BOOST_PP_APPLY((BOOST_PP_EMPTY))() 0 == 0, "");
2222

2323
# define MACRO(x, y, z) 1
2424
# define ARGS (1, 2, 3)
2525

26-
BEGIN BOOST_PP_EXPAND(MACRO ARGS) == 1 END
26+
static_assert(BOOST_PP_EXPAND(MACRO ARGS) == 1, "");
2727

28-
BEGIN BOOST_PP_IDENTITY(1)() == 1 END
29-
BEGIN BOOST_PP_IDENTITY_N(36,10)(0,1,2,3,4,5,6,7,8,9) == 36 END
28+
static_assert(BOOST_PP_IDENTITY(1)() == 1, "");
29+
static_assert(BOOST_PP_IDENTITY_N(36,10)(0,1,2,3,4,5,6,7,8,9) == 36, "");
3030

31-
BEGIN BOOST_PP_CAT(BOOST_PP_INTERCEPT, 2) 1 == 1 END
31+
static_assert(BOOST_PP_CAT(BOOST_PP_INTERCEPT, 2) 1 == 1, "");
3232

3333
#define OVMAC_1(x) BOOST_PP_ADD(x,5)
3434
#define OVMAC_2(x,y) BOOST_PP_ADD(x,y)
@@ -45,7 +45,7 @@ BEGIN BOOST_PP_CAT(BOOST_PP_INTERCEPT, 2) 1 == 1 END
4545

4646
#endif
4747

48-
BEGIN OVTEST(3,4,5) == 17 END
49-
BEGIN OVTEST(9,3,2,7) == 41 END
50-
BEGIN OVTEST(8) == 13 END
51-
BEGIN OVTEST(24,61) == 85 END
48+
static_assert(OVTEST(3,4,5) == 17, "");
49+
static_assert(OVTEST(9,3,2,7) == 41, "");
50+
static_assert(OVTEST(8) == 13, "");
51+
static_assert(OVTEST(24,61) == 85, "");

0 commit comments

Comments
 (0)