Updated multiplication and subtraction to check for maximum/minimum numbers.

include/boost/preprocessor/arithmetic/detail/Is_minmax.hpp

@@ -1,22 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Edward Diener 2020.                                    *
-#  *     Distributed under the Boost Software License, Version 1.0. (See      *
-#  *     accompanying file LICENSE_1_0.txt or copy at                         *
-#  *     http://www.boost.org/LICENSE_1_0.txt)                                *
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef BOOST_PREPROCESSOR_ARITHMETIC_DETAIL_IS_MINMAX_NUMBER_HPP
-# define BOOST_PREPROCESSOR_ARITHMETIC_DETAIL_IS_MINMAX_NUMBER_HPP
-#
-# /* BOOST_PP_DETAIL_IS_MINMAX_NUMBER */
-#
-# include <boost/preprocessor/arithmetic/detail/is_minimum_number.hpp>
-# include <boost/preprocessor/arithmetic/detail/is_maximum_number.hpp>
-#
-# define BOOST_PP_DETAIL_IS_MINMAX_NUMBER(x) (BOOST_PP_DETAIL_IS_MINIMUM_NUMBER(x),BOOST_PP_DETAIL_IS_MAXIMUM_NUMBER(x))
-#
-# endif

include/boost/preprocessor/arithmetic/detail/Is_minmax_both.hpp

@@ -1,21 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Edward Diener 2020.                                    *
-#  *     Distributed under the Boost Software License, Version 1.0. (See      *
-#  *     accompanying file LICENSE_1_0.txt or copy at                         *
-#  *     http://www.boost.org/LICENSE_1_0.txt)                                *
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef BOOST_PREPROCESSOR_ARITHMETIC_DETAIL_IS_MINMAX_BOTH_NUMBER_HPP
-# define BOOST_PREPROCESSOR_ARITHMETIC_DETAIL_IS_MINMAX_BOTH_NUMBER_HPP
-#
-# /* BOOST_PP_DETAIL_IS_MINMAX_BOTH_NUMBER */
-#
-# include <boost/preprocessor/arithmetic/detail/is_minmax.hpp>
-#
-# define BOOST_PP_DETAIL_IS_MINMAX_BOTH_NUMBER(x,y) (BOOST_PP_DETAIL_IS_MINMAX_NUMBER(x),BOOST_PP_DETAIL_IS_MINMAX_NUMBER(y))
-#
-# endif

include/boost/preprocessor/arithmetic/mul.hpp

@@ -17,16 +17,23 @@
 # include <boost/preprocessor/arithmetic/add.hpp>
 # include <boost/preprocessor/arithmetic/dec.hpp>
 # include <boost/preprocessor/config/config.hpp>
+# include <boost/preprocessor/control/iif.hpp>
 # include <boost/preprocessor/control/while.hpp>
 # include <boost/preprocessor/tuple/elem.hpp>
 # include <boost/preprocessor/tuple/rem.hpp>
+# include <boost/preprocessor/arithmetic/detail/is_minimum_number.hpp>
+# include <boost/preprocessor/arithmetic/detail/is_maximum_number.hpp>
 #
 # /* BOOST_PP_MUL */
 #
+#    define BOOST_PP_MUL(x, y) BOOST_PP_IIF(BOOST_PP_DETAIL_IS_MAXIMUM_NUMBER(y),BOOST_PP_MUL_CHECK_MIN,BOOST_PP_MUL_DO)(x,y)
+#
+#    define BOOST_PP_MUL_CHECK_MIN(x,y) BOOST_PP_IIF(BOOST_PP_DETAIL_IS_MINIMUM_NUMBER(x),0,BOOST_PP_DETAIL_MAXIMUM_NUMBER)
+#
 # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    define BOOST_PP_MUL(x, y) BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_WHILE(BOOST_PP_MUL_P, BOOST_PP_MUL_O, (0, x, y)))
+#    define BOOST_PP_MUL_DO(x, y) BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_WHILE(BOOST_PP_MUL_P, BOOST_PP_MUL_O, (0, x, y)))
 # else
-#    define BOOST_PP_MUL(x, y) BOOST_PP_MUL_I(x, y)
+#    define BOOST_PP_MUL_DO(x, y) BOOST_PP_MUL_I(x, y)
 #    define BOOST_PP_MUL_I(x, y) BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_WHILE(BOOST_PP_MUL_P, BOOST_PP_MUL_O, (0, x, y)))
 # endif
 #
@@ -43,10 +50,14 @@
 #
 # /* BOOST_PP_MUL_D */
 #
+#    define BOOST_PP_MUL_D(d, x, y) BOOST_PP_IIF(BOOST_PP_DETAIL_IS_MAXIMUM_NUMBER(y),BOOST_PP_MUL_CHECK_MIN_D,BOOST_PP_MUL_DO_D)(d,x,y)
+#
+#    define BOOST_PP_MUL_CHECK_MIN_D(d,x,y) BOOST_PP_IIF(BOOST_PP_DETAIL_IS_MINIMUM_NUMBER(x),0,BOOST_PP_DETAIL_MAXIMUM_NUMBER)
+#
 # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    define BOOST_PP_MUL_D(d, x, y) BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_WHILE_ ## d(BOOST_PP_MUL_P, BOOST_PP_MUL_O, (0, x, y)))
+#    define BOOST_PP_MUL_DO_D(d, x, y) BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_WHILE_ ## d(BOOST_PP_MUL_P, BOOST_PP_MUL_O, (0, x, y)))
 # else
-#    define BOOST_PP_MUL_D(d, x, y) BOOST_PP_MUL_D_I(d, x, y)
+#    define BOOST_PP_MUL_DO_D(d, x, y) BOOST_PP_MUL_D_I(d, x, y)
 #    define BOOST_PP_MUL_D_I(d, x, y) BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_WHILE_ ## d(BOOST_PP_MUL_P, BOOST_PP_MUL_O, (0, x, y)))
 # endif
 #

include/boost/preprocessor/arithmetic/sub.hpp

@@ -16,15 +16,20 @@
 #
 # include <boost/preprocessor/arithmetic/dec.hpp>
 # include <boost/preprocessor/config/config.hpp>
+# include <boost/preprocessor/control/iif.hpp>
 # include <boost/preprocessor/control/while.hpp>
+# include <boost/preprocessor/facilities/identity.hpp>
 # include <boost/preprocessor/tuple/elem.hpp>
+# include <boost/preprocessor/arithmetic/detail/is_maximum_number.hpp>
 #
 # /* BOOST_PP_SUB */
 #
+#    define BOOST_PP_SUB(x, y) BOOST_PP_IIF(BOOST_PP_DETAIL_IS_MAXIMUM_NUMBER(y),BOOST_PP_IDENTITY_N(0,2),BOOST_PP_SUB_DO)(x,y)
+#
 # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    define BOOST_PP_SUB(x, y) BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_WHILE(BOOST_PP_SUB_P, BOOST_PP_SUB_O, (x, y)))
+#    define BOOST_PP_SUB_DO(x, y) BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_WHILE(BOOST_PP_SUB_P, BOOST_PP_SUB_O, (x, y)))
 # else
-#    define BOOST_PP_SUB(x, y) BOOST_PP_SUB_I(x, y)
+#    define BOOST_PP_SUB_DO(x, y) BOOST_PP_SUB_I(x, y)
 #    define BOOST_PP_SUB_I(x, y) BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_WHILE(BOOST_PP_SUB_P, BOOST_PP_SUB_O, (x, y)))
 # endif
 #
@@ -40,10 +45,12 @@
 #
 # /* BOOST_PP_SUB_D */
 #
+#    define BOOST_PP_SUB_D(d, x, y) BOOST_PP_IIF(BOOST_PP_DETAIL_IS_MAXIMUM_NUMBER(y),BOOST_PP_IDENTITY_N(0,3),BOOST_PP_SUB_D_DO)(d,x,y)
+#
 # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    define BOOST_PP_SUB_D(d, x, y) BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_WHILE_ ## d(BOOST_PP_SUB_P, BOOST_PP_SUB_O, (x, y)))
+#    define BOOST_PP_SUB_D_DO(d, x, y) BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_WHILE_ ## d(BOOST_PP_SUB_P, BOOST_PP_SUB_O, (x, y)))
 # else
-#    define BOOST_PP_SUB_D(d, x, y) BOOST_PP_SUB_D_I(d, x, y)
+#    define BOOST_PP_SUB_D_DO(d, x, y) BOOST_PP_SUB_D_I(d, x, y)
 #    define BOOST_PP_SUB_D_I(d, x, y) BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_WHILE_ ## d(BOOST_PP_SUB_P, BOOST_PP_SUB_O, (x, y)))
 # endif
 #

test/arithmetic.cxx

@@ -17,6 +17,15 @@
 
 BEGIN BOOST_PP_ADD(2, 3) == 5 END
 
+#if BOOST_PP_LIMIT_MAG == 256
+
+BEGIN BOOST_PP_ADD(1, 256) == 256 END
+BEGIN BOOST_PP_ADD(256, 1) == 256 END
+BEGIN BOOST_PP_ADD(2, 255) == 256 END
+BEGIN BOOST_PP_ADD(255, 2) == 256 END
+
+#endif
+
 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
@@ -25,6 +34,11 @@ BEGIN BOOST_PP_ADD(BOOST_PP_ADD(2, 2), BOOST_PP_ADD(2, 2)) == 8 END
 
 BEGIN BOOST_PP_ADD(374, 129) == 503 END
 
+BEGIN BOOST_PP_ADD(1, 512) == 512 END
+BEGIN BOOST_PP_ADD(512, 1) == 512 END
+BEGIN BOOST_PP_ADD(2, 511) == 512 END
+BEGIN BOOST_PP_ADD(511, 2) == 512 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
@@ -42,6 +56,13 @@ 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 == 256
+
+BEGIN BOOST_PP_SUB(1, 256) == 0 END
+BEGIN BOOST_PP_SUB(256, 255) == 1 END
+
+#endif
+
 #if BOOST_PP_LIMIT_MAG == 512
 
 BEGIN BOOST_PP_SUB(315, 412) == 0 END
@@ -49,6 +70,9 @@ 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(1, 512) == 0 END
+BEGIN BOOST_PP_SUB(512, 511) == 1 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
@@ -67,6 +91,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
 
+BEGIN BOOST_PP_MUL(0, BOOST_PP_LIMIT_MAG) == 0 END
+BEGIN BOOST_PP_MUL(2, BOOST_PP_LIMIT_MAG) == BOOST_PP_LIMIT_MAG END
+BEGIN BOOST_PP_MUL(BOOST_PP_LIMIT_MAG, 0) == 0 END
+BEGIN BOOST_PP_MUL(BOOST_PP_LIMIT_MAG, 2) == BOOST_PP_LIMIT_MAG END
+
+#if BOOST_PP_LIMIT_MAG == 256
+
+// BEGIN BOOST_PP_MUL(2, 255) == 256 END
+// BEGIN BOOST_PP_MUL(255, 2) == 256 END
+BEGIN BOOST_PP_MUL(17, 17) == 256 END
+
+#endif
+
 #if BOOST_PP_LIMIT_MAG == 512
 
 BEGIN BOOST_PP_MUL(0, 351) == 0 END
@@ -78,6 +115,10 @@ 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
 
+// BEGIN BOOST_PP_MUL(2, 511) == 512 END
+// BEGIN BOOST_PP_MUL(511, 2) == 512 END
+BEGIN BOOST_PP_MUL(24, 24) == 512 END
+
 #endif
 
 /* division */