From efa576203b706e002b4f72a608ffd0b4ec380b90 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Sat, 9 May 2020 17:03:48 -0400 Subject: [PATCH] Testing of numbers up to 512 --- test/Jamfile.v2 | 133 ++++++++++++++++++++++++++++++++++++++++++++ test/arithmetic.cxx | 107 +++++++++++++++++++++++++++++------ test/comparison.cxx | 45 +++++++++++++++ test/logical.cxx | 33 +++++++++++ 4 files changed, 302 insertions(+), 16 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 985a83d..89257e2 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -175,6 +175,70 @@ alias preprocessor_c ] ; +alias preprocessor_c_number_512 + : + [ compile arithmetic.c + : BOOST_PP_LIMIT_MAG=512 + : arithmetic_c_num + ] + [ compile array.c + : BOOST_PP_LIMIT_MAG=512 + : array_c_num + ] + [ compile comparison.c + : BOOST_PP_LIMIT_MAG=512 + : comparison_c_num + ] + [ compile control.c + : BOOST_PP_LIMIT_MAG=512 + : control_c_num + ] + [ compile debug.c + : BOOST_PP_LIMIT_MAG=512 + : debug_c_num + ] + [ compile facilities.c + : BOOST_PP_LIMIT_MAG=512 + : facilities_c_num + ] + [ compile list.c + : BOOST_PP_LIMIT_MAG=512 + : list_c_num + ] + [ compile logical.c + : BOOST_PP_LIMIT_MAG=512 + : logical_c_num + ] + [ compile punctuation.c + : BOOST_PP_LIMIT_MAG=512 + : punctuation_c_num + ] + [ compile selection.c + : BOOST_PP_LIMIT_MAG=512 + : selection_c_num + ] + [ compile seq.c + : BOOST_PP_LIMIT_MAG=512 + : seq_c_num + ] + [ compile slot.c + : BOOST_PP_LIMIT_MAG=512 + : slot_c_num + ] + [ compile stringize.c + : BOOST_PP_LIMIT_MAG=512 + : stringize_c_num + ] + [ compile tuple.c + : BOOST_PP_LIMIT_MAG=512 + : tuple_c_num + ] + [ compile variadic.c + : BOOST_PP_LIMIT_MAG=512 + : variadic_c_num + ] + ; + alias preprocessor_c_nvm : [ compile arithmetic.c @@ -231,6 +295,75 @@ alias preprocessor_c_nvm ] ; +alias preprocessor_c_nvm_num + : + [ compile arithmetic.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : arithmetic_c_nvm_num + ] + [ compile array.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : array_c_nvm_num + ] + [ compile comparison.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : comparison_c_nvm_num + ] + [ compile control.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : control_c_nvm_num + ] + [ compile debug.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : debug_c_nvm_num + ] + [ compile facilities.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : facilities_c_nvm_num + ] + [ compile list.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : list_c_nvm_num + ] + [ compile logical.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : logical_c_nvm_num + ] + [ compile selection.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : selection_c_nvm_num + ] + [ compile seq.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : seq_c_nvm_num + ] + [ compile slot.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : slot_c_nvm_num + ] + [ compile stringize.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : stringize_c_nvm_num + ] + [ compile tuple.c + : BOOST_PP_VARIADICS=0 + BOOST_PP_LIMIT_MAG=512 + : tuple_c_nvm_num + ] + ; + alias preprocessor_isempty : : gcc 3.4 diff --git a/test/arithmetic.cxx b/test/arithmetic.cxx index d375f62..f097769 100644 --- a/test/arithmetic.cxx +++ b/test/arithmetic.cxx @@ -21,6 +21,23 @@ BEGIN BOOST_PP_ADD(BOOST_PP_ADD(2, 2), 2) == 6 END BEGIN BOOST_PP_ADD(2, BOOST_PP_ADD(1, 4)) == 7 END BEGIN BOOST_PP_ADD(BOOST_PP_ADD(2, 2), BOOST_PP_ADD(2, 2)) == 8 END +#if BOOST_PP_LIMIT_MAG == 256 + +BEGIN BOOST_PP_ADD(149, BOOST_PP_ADD(102, 137)) == 256 END + +#endif + +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_ADD(374, 129) == 503 END + +BEGIN BOOST_PP_ADD(BOOST_PP_ADD(134, 187), 95) == 416 END +BEGIN BOOST_PP_ADD(BOOST_PP_ADD(83, 120), BOOST_PP_ADD(204, 51)) == 458 END +BEGIN BOOST_PP_ADD(149, BOOST_PP_ADD(102, 137)) == 388 END +BEGIN BOOST_PP_ADD(357, BOOST_PP_ADD(102, 137)) == 512 END + +#endif + /* subtraction */ BEGIN BOOST_PP_SUB(11, 0) == 11 END @@ -31,6 +48,20 @@ BEGIN BOOST_PP_SUB(5, BOOST_PP_SUB(3, 2)) == 4 END BEGIN BOOST_PP_SUB(BOOST_PP_SUB(10, 5), 2) == 3 END BEGIN BOOST_PP_SUB(BOOST_PP_SUB(7, 3), BOOST_PP_SUB(10, 8)) == 2 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_SUB(315, 412) == 0 END +BEGIN BOOST_PP_SUB(511, 510) == 1 END +BEGIN BOOST_PP_SUB(463, 317) == 146 END +BEGIN BOOST_PP_SUB(272, 195) == 77 END + +BEGIN BOOST_PP_SUB(371, BOOST_PP_SUB(3, 2)) == 370 END +BEGIN BOOST_PP_SUB(BOOST_PP_SUB(478, 211), 58) == 209 END +BEGIN BOOST_PP_SUB(BOOST_PP_SUB(395, 277), BOOST_PP_SUB(10, 7)) == 115 END +BEGIN BOOST_PP_SUB(BOOST_PP_SUB(412, 383), BOOST_PP_SUB(512, 506)) == 23 END + +#endif + /* multiplication */ BEGIN BOOST_PP_MUL(0, 1) == 0 END @@ -42,6 +73,19 @@ BEGIN BOOST_PP_MUL(BOOST_PP_MUL(2, 2), 2) == 8 END BEGIN BOOST_PP_MUL(2, BOOST_PP_MUL(2, 2)) == 8 END BEGIN BOOST_PP_MUL(BOOST_PP_MUL(2, 2), BOOST_PP_MUL(2, 2)) == 16 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_MUL(0, 351) == 0 END +BEGIN BOOST_PP_MUL(489, 0) == 0 END +BEGIN BOOST_PP_MUL(1, 272) == 272 END +BEGIN BOOST_PP_MUL(34, 11) == 374 END + +BEGIN BOOST_PP_MUL(BOOST_PP_MUL(7, 7), 7) == 343 END +BEGIN BOOST_PP_MUL(7, BOOST_PP_MUL(7, 7)) == 343 END +BEGIN BOOST_PP_MUL(BOOST_PP_MUL(5, 5), BOOST_PP_MUL(4, 4)) == 400 END + +#endif + /* division */ BEGIN BOOST_PP_DIV(2, 1) == 2 END @@ -52,6 +96,18 @@ BEGIN BOOST_PP_DIV(BOOST_PP_DIV(4, 2), 2) == 1 END BEGIN BOOST_PP_DIV(10, BOOST_PP_DIV(10, 2)) == 2 END BEGIN BOOST_PP_DIV(BOOST_PP_DIV(10, 2), BOOST_PP_DIV(4, 2)) == 2 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_DIV(468, 3) == 156 END +BEGIN BOOST_PP_DIV(0, 272) == 0 END +BEGIN BOOST_PP_DIV(335, 6) == 55 END + +BEGIN BOOST_PP_DIV(BOOST_PP_DIV(498, 2), 2) == 124 END +BEGIN BOOST_PP_DIV(375, BOOST_PP_DIV(279, 3)) == 4 END +BEGIN BOOST_PP_DIV(BOOST_PP_DIV(486, 2), BOOST_PP_DIV(17, 4)) == 60 END + +#endif + /* modulus */ BEGIN BOOST_PP_MOD(5, 5) == 0 END @@ -61,35 +117,41 @@ BEGIN BOOST_PP_MOD(7, 4) == 3 END BEGIN BOOST_PP_MOD(BOOST_PP_MOD(5, 3), 3) == 2 END BEGIN BOOST_PP_MOD(5, BOOST_PP_MOD(4, 3)) == 0 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_MOD(473, 473) == 0 END +BEGIN BOOST_PP_MOD(381, 126) == 3 END +BEGIN BOOST_PP_MOD(262, 27) == 19 END + +BEGIN BOOST_PP_MOD(BOOST_PP_MOD(368, 65), 7) == 1 END +BEGIN BOOST_PP_MOD(194, BOOST_PP_MOD(411, 205)) == 0 END + +#endif + /* increment */ BEGIN BOOST_PP_INC(0) == 1 END BEGIN BOOST_PP_INC(22) == 23 END - -#if BOOST_PP_LIMIT_MAG > 256 - -BEGIN BOOST_PP_INC(256) == 257 END - -#else - -BEGIN BOOST_PP_INC(256) == 256 END - -#endif - BEGIN BOOST_PP_INC(BOOST_PP_INC(0)) == 2 END BEGIN BOOST_PP_INC(BOOST_PP_INC(17)) == 19 END -#if BOOST_PP_LIMIT_MAG > 256 - -BEGIN BOOST_PP_INC(BOOST_PP_INC(255)) == 257 END - -#else +#if BOOST_PP_LIMIT_MAG == 256 +BEGIN BOOST_PP_INC(256) == 256 END BEGIN BOOST_PP_INC(BOOST_PP_INC(255)) == 256 END #endif +#if BOOST_PP_LIMIT_MAG == 512 +BEGIN BOOST_PP_INC(349) == 350 END +BEGIN BOOST_PP_INC(426) == 427 END +BEGIN BOOST_PP_INC(256) == 257 END +BEGIN BOOST_PP_INC(BOOST_PP_INC(505)) == 507 END +BEGIN BOOST_PP_INC(BOOST_PP_INC(272)) == 274 END +BEGIN BOOST_PP_INC(BOOST_PP_INC(255)) == 257 END + +#endif /* decrement */ @@ -100,3 +162,16 @@ BEGIN BOOST_PP_DEC(0) == 0 END BEGIN BOOST_PP_DEC(BOOST_PP_DEC(256)) == 254 END BEGIN BOOST_PP_DEC(BOOST_PP_DEC(85)) == 83 END BEGIN BOOST_PP_DEC(BOOST_PP_DEC(1)) == 0 END + +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_DEC(257) == 256 END +BEGIN BOOST_PP_DEC(473) == 472 END +BEGIN BOOST_PP_DEC(512) == 511 END + +BEGIN BOOST_PP_DEC(BOOST_PP_DEC(257)) == 255 END +BEGIN BOOST_PP_DEC(BOOST_PP_DEC(329)) == 327 END +BEGIN BOOST_PP_DEC(BOOST_PP_DEC(512)) == 510 END + +#endif + diff --git a/test/comparison.cxx b/test/comparison.cxx index 77e7b1a..df4628d 100644 --- a/test/comparison.cxx +++ b/test/comparison.cxx @@ -17,29 +17,74 @@ BEGIN BOOST_PP_EQUAL(2, 0) == 0 END BEGIN BOOST_PP_EQUAL(2, 2) == 1 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_EQUAL(135, 487) == 0 END +BEGIN BOOST_PP_EQUAL(367, 367) == 1 END + +#endif + /* inequality */ BEGIN BOOST_PP_NOT_EQUAL(2, 0) == 1 END BEGIN BOOST_PP_NOT_EQUAL(2, 2) == 0 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_NOT_EQUAL(375, 126) == 1 END +BEGIN BOOST_PP_NOT_EQUAL(439, 439) == 0 END + +#endif + /* less */ BEGIN BOOST_PP_LESS(2, 1) == 0 END BEGIN BOOST_PP_LESS(1, 2) == 1 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_LESS(265, 241) == 0 END +BEGIN BOOST_PP_LESS(510, 511) == 1 END + +#endif + /* less_equal */ BEGIN BOOST_PP_LESS_EQUAL(2, 1) == 0 END BEGIN BOOST_PP_LESS_EQUAL(1, 2) == 1 END BEGIN BOOST_PP_LESS_EQUAL(2, 2) == 1 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_LESS_EQUAL(327, 211) == 0 END +BEGIN BOOST_PP_LESS_EQUAL(489, 502) == 1 END +BEGIN BOOST_PP_LESS_EQUAL(327, 327) == 1 END + +#endif + /* greater */ BEGIN BOOST_PP_GREATER(2, 1) == 1 END BEGIN BOOST_PP_GREATER(1, 2) == 0 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_GREATER(348, 259) == 1 END +BEGIN BOOST_PP_GREATER(411, 411) == 0 END +BEGIN BOOST_PP_GREATER(327, 373) == 0 END + +#endif + /* greater_equal */ BEGIN BOOST_PP_GREATER_EQUAL(2, 1) == 1 END BEGIN BOOST_PP_GREATER_EQUAL(1, 2) == 0 END BEGIN BOOST_PP_GREATER_EQUAL(2, 2) == 1 END + +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_GREATER_EQUAL(341, 27) == 1 END +BEGIN BOOST_PP_GREATER_EQUAL(289, 470) == 0 END +BEGIN BOOST_PP_GREATER_EQUAL(296, 296) == 1 END + +#endif diff --git a/test/logical.cxx b/test/logical.cxx index 30bde7b..d6bef98 100644 --- a/test/logical.cxx +++ b/test/logical.cxx @@ -38,6 +38,36 @@ BEGIN BOOST_PP_NOR(8, 9) == 0 END BEGIN BOOST_PP_BOOL(22) == 1 END BEGIN BOOST_PP_BOOL(0) == 0 END +#if BOOST_PP_LIMIT_MAG == 512 + +BEGIN BOOST_PP_NOT(0) == 1 END +BEGIN BOOST_PP_NOT(283) == 0 END + +BEGIN BOOST_PP_AND(0, 0) == 0 END +BEGIN BOOST_PP_AND(0, 505) == 0 END +BEGIN BOOST_PP_AND(376, 0) == 0 END +BEGIN BOOST_PP_AND(482, 139) == 1 END + +BEGIN BOOST_PP_OR(0, 0) == 0 END +BEGIN BOOST_PP_OR(0, 274) == 1 END +BEGIN BOOST_PP_OR(512, 0) == 1 END +BEGIN BOOST_PP_OR(23, 386) == 1 END + +BEGIN BOOST_PP_XOR(0, 0) == 0 END +BEGIN BOOST_PP_XOR(0, 494) == 1 END +BEGIN BOOST_PP_XOR(391, 0) == 1 END +BEGIN BOOST_PP_XOR(260, 438) == 0 END + +BEGIN BOOST_PP_NOR(0, 0) == 1 END +BEGIN BOOST_PP_NOR(0, 455) == 0 END +BEGIN BOOST_PP_NOR(338, 0) == 0 END +BEGIN BOOST_PP_NOR(267, 504) == 0 END + +BEGIN BOOST_PP_BOOL(378) == 1 END +BEGIN BOOST_PP_BOOL(0) == 0 END + +#endif + BEGIN BOOST_PP_BITAND(0, 0) == 0 END BEGIN BOOST_PP_BITAND(0, 1) == 0 END BEGIN BOOST_PP_BITAND(1, 0) == 0 END @@ -57,3 +87,6 @@ BEGIN BOOST_PP_BITXOR(0, 0) == 0 END BEGIN BOOST_PP_BITXOR(0, 1) == 1 END BEGIN BOOST_PP_BITXOR(1, 0) == 1 END BEGIN BOOST_PP_BITXOR(1, 1) == 0 END + +BEGIN BOOST_PP_COMPL(0) == 1 END +BEGIN BOOST_PP_COMPL(1) == 0 END