From 8b9dcd78491228d2da55737ea2165a8a0e4efd53 Mon Sep 17 00:00:00 2001 From: Paul Mensonides Date: Thu, 20 Jun 2002 07:25:26 +0000 Subject: [PATCH] bug fixes, and filename support [SVN r14207] --- .../boost/preprocessor/detail/iterate/exp1.hpp | 17 +++++++++++++---- .../boost/preprocessor/detail/iterate/exp2.hpp | 17 +++++++++++++---- .../boost/preprocessor/detail/iterate/exp3.hpp | 17 +++++++++++++---- .../boost/preprocessor/detail/iterate/exp4.hpp | 17 +++++++++++++---- .../boost/preprocessor/detail/iterate/exp5.hpp | 17 +++++++++++++---- 5 files changed, 65 insertions(+), 20 deletions(-) diff --git a/include/boost/preprocessor/detail/iterate/exp1.hpp b/include/boost/preprocessor/detail/iterate/exp1.hpp index 917746b..0fd0100 100644 --- a/include/boost/preprocessor/detail/iterate/exp1.hpp +++ b/include/boost/preprocessor/detail/iterate/exp1.hpp @@ -8,16 +8,21 @@ # * * # ************************************************************************** */ # -# ifndef BOOST_PP_FILENAME_1 -# error BOOST_PP: depth #1 filename is not defined -# endif -# # ifdef BOOST_PP_ITERATION_LIMITS +# ifndef BOOST_PP_FILENAME_1 +# error BOOST_PP: depth #1 filename is not defined +# endif # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_START() # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_FINISH() # undef BOOST_PP_ITERATION_LIMITS +# elif defined(BOOST_PP_ITERATION_PARAMS_1) +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_ITERATION_PARAMS_1) +# include BOOST_PP_SET_ITERATION_START() +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 1, BOOST_PP_ITERATION_PARAMS_1) +# include BOOST_PP_SET_ITERATION_FINISH() +# define BOOST_PP_FILENAME_1 BOOST_PP_TUPLE_ELEM(3, 2, BOOST_PP_ITERATION_PARAMS_1) # else # error BOOST_PP: depth #1 iterations boundaries not defined # endif @@ -1326,4 +1331,8 @@ # undef BOOST_PP_ITERATION_DEPTH # define BOOST_PP_ITERATION_DEPTH() 0 # +# undef BOOST_PP_ITERATION_START_1 +# undef BOOST_PP_ITERATION_FINISH_1 # undef BOOST_PP_FILENAME_1 +# +# undef BOOST_PP_ITERATION_PARAMS_1 diff --git a/include/boost/preprocessor/detail/iterate/exp2.hpp b/include/boost/preprocessor/detail/iterate/exp2.hpp index cdbd44d..3d93612 100644 --- a/include/boost/preprocessor/detail/iterate/exp2.hpp +++ b/include/boost/preprocessor/detail/iterate/exp2.hpp @@ -8,16 +8,21 @@ # * * # ************************************************************************** */ # -# ifndef BOOST_PP_FILENAME_2 -# error BOOST_PP: depth #2 filename is not defined -# endif -# # ifdef BOOST_PP_ITERATION_LIMITS +# ifndef BOOST_PP_FILENAME_2 +# error BOOST_PP: depth #2 filename is not defined +# endif # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_START() # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_FINISH() # undef BOOST_PP_ITERATION_LIMITS +# elif defined(BOOST_PP_ITERATION_PARAMS_2) +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_ITERATION_PARAMS_2) +# include BOOST_PP_SET_ITERATION_START() +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 1, BOOST_PP_ITERATION_PARAMS_2) +# include BOOST_PP_SET_ITERATION_FINISH() +# define BOOST_PP_FILENAME_2 BOOST_PP_TUPLE_ELEM(3, 2, BOOST_PP_ITERATION_PARAMS_2) # else # error BOOST_PP: depth #2 iterations boundaries not defined # endif @@ -1322,4 +1327,8 @@ # undef BOOST_PP_ITERATION_DEPTH # define BOOST_PP_ITERATION_DEPTH() 1 # +# undef BOOST_PP_ITERATION_START_2 +# undef BOOST_PP_ITERATION_FINISH_2 # undef BOOST_PP_FILENAME_2 +# +# undef BOOST_PP_ITERATION_PARAMS_2 diff --git a/include/boost/preprocessor/detail/iterate/exp3.hpp b/include/boost/preprocessor/detail/iterate/exp3.hpp index d64f581..0ade127 100644 --- a/include/boost/preprocessor/detail/iterate/exp3.hpp +++ b/include/boost/preprocessor/detail/iterate/exp3.hpp @@ -8,16 +8,21 @@ # * * # ************************************************************************** */ # -# ifndef BOOST_PP_FILENAME_3 -# error BOOST_PP: depth #3 filename is not defined -# endif -# # ifdef BOOST_PP_ITERATION_LIMITS +# ifndef BOOST_PP_FILENAME_3 +# error BOOST_PP: depth #3 filename is not defined +# endif # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_START() # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_FINISH() # undef BOOST_PP_ITERATION_LIMITS +# elif defined(BOOST_PP_ITERATION_PARAMS_3) +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_ITERATION_PARAMS_3) +# include BOOST_PP_SET_ITERATION_START() +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 1, BOOST_PP_ITERATION_PARAMS_3) +# include BOOST_PP_SET_ITERATION_FINISH() +# define BOOST_PP_FILENAME_3 BOOST_PP_TUPLE_ELEM(3, 2, BOOST_PP_ITERATION_PARAMS_3) # else # error BOOST_PP: depth #3 iterations boundaries not defined # endif @@ -1322,4 +1327,8 @@ # undef BOOST_PP_ITERATION_DEPTH # define BOOST_PP_ITERATION_DEPTH() 2 # +# undef BOOST_PP_ITERATION_START_3 +# undef BOOST_PP_ITERATION_FINISH_3 # undef BOOST_PP_FILENAME_3 +# +# undef BOOST_PP_ITERATION_PARAMS_3 diff --git a/include/boost/preprocessor/detail/iterate/exp4.hpp b/include/boost/preprocessor/detail/iterate/exp4.hpp index 0a6e8a5..a32821e 100644 --- a/include/boost/preprocessor/detail/iterate/exp4.hpp +++ b/include/boost/preprocessor/detail/iterate/exp4.hpp @@ -8,16 +8,21 @@ # * * # ************************************************************************** */ # -# ifndef BOOST_PP_FILENAME_4 -# error BOOST_PP: depth #4 filename is not defined -# endif -# # ifdef BOOST_PP_ITERATION_LIMITS +# ifndef BOOST_PP_FILENAME_4 +# error BOOST_PP: depth #4 filename is not defined +# endif # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_START() # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_FINISH() # undef BOOST_PP_ITERATION_LIMITS +# elif defined(BOOST_PP_ITERATION_PARAMS_4) +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_ITERATION_PARAMS_4) +# include BOOST_PP_SET_ITERATION_START() +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 1, BOOST_PP_ITERATION_PARAMS_4) +# include BOOST_PP_SET_ITERATION_FINISH() +# define BOOST_PP_FILENAME_4 BOOST_PP_TUPLE_ELEM(3, 2, BOOST_PP_ITERATION_PARAMS_4) # else # error BOOST_PP: depth #4 iterations boundaries not defined # endif @@ -1322,4 +1327,8 @@ # undef BOOST_PP_ITERATION_DEPTH # define BOOST_PP_ITERATION_DEPTH() 3 # +# undef BOOST_PP_ITERATION_START_4 +# undef BOOST_PP_ITERATION_FINISH_4 # undef BOOST_PP_FILENAME_4 +# +# undef BOOST_PP_ITERATION_PARAMS_4 diff --git a/include/boost/preprocessor/detail/iterate/exp5.hpp b/include/boost/preprocessor/detail/iterate/exp5.hpp index 3ae9750..d665a47 100644 --- a/include/boost/preprocessor/detail/iterate/exp5.hpp +++ b/include/boost/preprocessor/detail/iterate/exp5.hpp @@ -8,16 +8,21 @@ # * * # ************************************************************************** */ # -# ifndef BOOST_PP_FILENAME_5 -# error BOOST_PP: depth #5 filename is not defined -# endif -# # ifdef BOOST_PP_ITERATION_LIMITS +# ifndef BOOST_PP_FILENAME_5 +# error BOOST_PP: depth #5 filename is not defined +# endif # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_START() # define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS) # include BOOST_PP_SET_ITERATION_FINISH() # undef BOOST_PP_ITERATION_LIMITS +# elif defined(BOOST_PP_ITERATION_PARAMS_5) +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 0, BOOST_PP_ITERATION_PARAMS_5) +# include BOOST_PP_SET_ITERATION_START() +# define BOOST_PP_ITERATION_BOUND BOOST_PP_TUPLE_ELEM(3, 1, BOOST_PP_ITERATION_PARAMS_5) +# include BOOST_PP_SET_ITERATION_FINISH() +# define BOOST_PP_FILENAME_5 BOOST_PP_TUPLE_ELEM(3, 2, BOOST_PP_ITERATION_PARAMS_5) # else # error BOOST_PP: depth #5 iterations boundaries not defined # endif @@ -1322,4 +1327,8 @@ # undef BOOST_PP_ITERATION_DEPTH # define BOOST_PP_ITERATION_DEPTH() 4 # +# undef BOOST_PP_ITERATION_START_5 +# undef BOOST_PP_ITERATION_FINISH_5 # undef BOOST_PP_FILENAME_5 +# +# undef BOOST_PP_ITERATION_PARAMS_5