From d41d1dda976c8f2b772ccb68e64232316470b7f9 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Sun, 7 Jun 2020 15:49:53 -0400 Subject: [PATCH] Updated multiplication and subtraction to check for maximum/minimum numbers. --- .../arithmetic/detail/Is_minmax.hpp | 22 ---------- .../arithmetic/detail/Is_minmax_both.hpp | 21 ---------- include/boost/preprocessor/arithmetic/mul.hpp | 19 +++++++-- include/boost/preprocessor/arithmetic/sub.hpp | 15 +++++-- test/arithmetic.cxx | 41 +++++++++++++++++++ 5 files changed, 67 insertions(+), 51 deletions(-) delete mode 100644 include/boost/preprocessor/arithmetic/detail/Is_minmax.hpp delete mode 100644 include/boost/preprocessor/arithmetic/detail/Is_minmax_both.hpp diff --git a/include/boost/preprocessor/arithmetic/detail/Is_minmax.hpp b/include/boost/preprocessor/arithmetic/detail/Is_minmax.hpp deleted file mode 100644 index 98bca0f..0000000 --- a/include/boost/preprocessor/arithmetic/detail/Is_minmax.hpp +++ /dev/null @@ -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 -# include -# -# define BOOST_PP_DETAIL_IS_MINMAX_NUMBER(x) (BOOST_PP_DETAIL_IS_MINIMUM_NUMBER(x),BOOST_PP_DETAIL_IS_MAXIMUM_NUMBER(x)) -# -# endif diff --git a/include/boost/preprocessor/arithmetic/detail/Is_minmax_both.hpp b/include/boost/preprocessor/arithmetic/detail/Is_minmax_both.hpp deleted file mode 100644 index b205ed3..0000000 --- a/include/boost/preprocessor/arithmetic/detail/Is_minmax_both.hpp +++ /dev/null @@ -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 -# -# 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 diff --git a/include/boost/preprocessor/arithmetic/mul.hpp b/include/boost/preprocessor/arithmetic/mul.hpp index f3d9ffc..773ff9e 100644 --- a/include/boost/preprocessor/arithmetic/mul.hpp +++ b/include/boost/preprocessor/arithmetic/mul.hpp @@ -17,16 +17,23 @@ # include # include # include +# include # include # include # include +# include +# include # # /* 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 # diff --git a/include/boost/preprocessor/arithmetic/sub.hpp b/include/boost/preprocessor/arithmetic/sub.hpp index 5262cda..39db303 100644 --- a/include/boost/preprocessor/arithmetic/sub.hpp +++ b/include/boost/preprocessor/arithmetic/sub.hpp @@ -16,15 +16,20 @@ # # include # include +# include # include +# include # include +# include # # /* 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 # diff --git a/test/arithmetic.cxx b/test/arithmetic.cxx index 3612636..39a14fb 100644 --- a/test/arithmetic.cxx +++ b/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 */