From 776037ae56fb3aa91435b307eb14feccb15e7271 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Thu, 31 Oct 2019 06:07:10 -0400 Subject: [PATCH] Corrected implementation and testing for BOOST_PP_VA_OPT --- .../boost/preprocessor/facilities/va_opt.hpp | 23 +++-- test/Jamfile.v2 | 1 + test/vaopt.cpp | 12 +++ test/vaopt.cxx | 88 +++++++++++++++++++ 4 files changed, 115 insertions(+), 9 deletions(-) create mode 100644 test/vaopt.cpp create mode 100644 test/vaopt.cxx diff --git a/include/boost/preprocessor/facilities/va_opt.hpp b/include/boost/preprocessor/facilities/va_opt.hpp index bb25f1b..de0e69e 100644 --- a/include/boost/preprocessor/facilities/va_opt.hpp +++ b/include/boost/preprocessor/facilities/va_opt.hpp @@ -16,14 +16,19 @@ # include # include # include -# define BOOST_PP_VA_OPT(rdata,rempty,...) \ - BOOST_PP_TUPLE_REM() \ - BOOST_PP_IIF \ - ( \ - BOOST_PP_CHECK_EMPTY(__VA_ARGS__), \ - rempty, \ - rdata \ - } \ -/**? +# define BOOST_PP_VA_OPT_IMPL(atuple) \ + BOOST_PP_TUPLE_REM() atuple \ +/**/ +# define BOOST_PP_VA_OPT(rdata,rempty,...) \ + BOOST_PP_VA_OPT_IMPL \ + ( \ + BOOST_PP_IIF \ + ( \ + BOOST_PP_CHECK_EMPTY(__VA_ARGS__), \ + rempty, \ + rdata \ + ) \ + ) \ +/**/ # endif /* BOOST_PP_VARIADIC_HAS_OPT() */ # endif /* BOOST_PREPROCESSOR_FACILITIES_VA_OPT_HPP */ diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 811e4e2..fbda6c0 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -214,6 +214,7 @@ alias preprocessor_isempty [ compile checkempty.cpp ] [ compile-fail isempty_variadic_standard_failure.cpp : BOOST_PP_VARIADICS=1 ] [ compile-fail isempty_variadic_standard_failure2.cpp : BOOST_PP_VARIADICS=1 ] + [ compile vaopt.cpp ] ; alias preprocessor_isempty_nvm diff --git a/test/vaopt.cpp b/test/vaopt.cpp new file mode 100644 index 0000000..9801a19 --- /dev/null +++ b/test/vaopt.cpp @@ -0,0 +1,12 @@ +# /* ************************************************************************** +# * * +# * (C) Copyright Edward Diener 2019. +# * 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. */ +# +# include diff --git a/test/vaopt.cxx b/test/vaopt.cxx new file mode 100644 index 0000000..6cb8702 --- /dev/null +++ b/test/vaopt.cxx @@ -0,0 +1,88 @@ +# /* ************************************************************************** +# * * +# * (C) Copyright Edward Diener 2019. +# * 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. */ +# +# include +# include + +# if BOOST_PP_VARIADIC_HAS_OPT() + +# include +# include +# include + +#define DATA +#define OBJECT OBJECT2 +#define OBJECT2 +#define FUNC(x) FUNC2(x) +#define FUNC2(x) +#define FUNC_GEN() () +#define FUNC_GEN2(x) () +#define FUNC_GEN3() (&) +#define FUNC_GEN4(x) (y) +#define FUNC_GEN5() (y,z) +#define FUNC_GEN6() anything +#define FUNC_GEN7(x) anything +#define FUNC_GEN8(x,y) (1,2,3) +#define FUNC_GEN9(x,y,z) anything +#define FUNC_GEN10(x) (y) data +#define NAME &name +#define ATUPLE (atuple) +#define ATUPLE_PLUS (atuple) data + +#define TRY_PASS_EMPTY_STD(...) BOOST_PP_VARIADIC_ELEM(0, __VA_OPT__ (0,) 1) +#define TRY_PASS_EMPTY_BOOST(...) BOOST_PP_VARIADIC_ELEM(0,BOOST_PP_VA_OPT((0),(1),__VA_ARGS__)) + +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN2) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN2) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN3) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN3) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN4) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN4) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN5) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN5) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN8) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN8) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN9) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN9) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN10) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN10) == 0 END +BEGIN TRY_PASS_EMPTY_STD(BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_BOOST(BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_STD(DATA BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_BOOST(DATA BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_STD() == 1 END +BEGIN TRY_PASS_EMPTY_BOOST() == 1 END +BEGIN TRY_PASS_EMPTY_STD(DATA) == 1 END +BEGIN TRY_PASS_EMPTY_BOOST(DATA) == 1 END +BEGIN TRY_PASS_EMPTY_STD(x BOOST_PP_EMPTY()) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(x BOOST_PP_EMPTY()) == 0 END +BEGIN TRY_PASS_EMPTY_STD(OBJECT BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_BOOST(OBJECT BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_STD(FUNC(z) BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC(z) BOOST_PP_EMPTY()) == 1 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN6) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN6) == 0 END +BEGIN TRY_PASS_EMPTY_STD(FUNC_GEN7) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(FUNC_GEN7) == 0 END +BEGIN TRY_PASS_EMPTY_STD(NAME) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(NAME) == 0 END +BEGIN TRY_PASS_EMPTY_STD(ATUPLE) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(ATUPLE) == 0 END +BEGIN TRY_PASS_EMPTY_STD(ATUPLE_PLUS) == 0 END +BEGIN TRY_PASS_EMPTY_BOOST(ATUPLE_PLUS) == 0 END + +# else + +BEGIN 1 == 1 END + +# endif