From 4050754ab43563d672f04371c552f7b060deef7b Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Tue, 12 Sep 2017 14:17:30 +1000 Subject: [PATCH] preprocessor: use a script to create map/reduce We need over 300 arguments for some projects and I'm not going to code that shit by hand. --- .gitignore | 1 + CMakeLists.txt | 23 +- coord/ops.hpp | 3 +- introspection.hpp | 2 +- io.cpp | 2 +- json/flat.cpp.rl | 4 +- json/tree.cpp | 7 +- log.hpp | 3 +- preprocessor.hpp | 516 ------------------------------------------ preprocessor.py | 202 +++++++++++++++++ test/preprocessor.cpp | 21 ++ 11 files changed, 256 insertions(+), 528 deletions(-) delete mode 100644 preprocessor.hpp create mode 100755 preprocessor.py create mode 100644 test/preprocessor.cpp diff --git a/.gitignore b/.gitignore index 6bb74d77..a5bbabed 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ Makefile Makefile.in /missing +/preprocessor.hpp /stamp-h1 /test-driver /uri.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 9711e82d..eb847c7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,8 @@ include (nc) include (search_libs) -find_package(RAGEL 6.9 REQUIRED) +find_package (PythonInterp 3 REQUIRED) +find_package (RAGEL 6.9 REQUIRED) ############################################################################### @@ -418,6 +419,25 @@ list ( view.hpp ) + +##----------------------------------------------------------------------------- +## We shouldn't be building into the source directory, but I can't stand trying +## to coax CMake into behaving here any longer. Feel free to fix it. +add_custom_command ( +OUTPUT + "${CMAKE_CURRENT_SOURCE_DIR}/preprocessor.hpp" +COMMENT + "[preprocessor.py] preprocessor.hpp" +COMMAND + "${PYTHON_EXECUTABLE}" + "${CMAKE_CURRENT_SOURCE_DIR}/preprocessor.py" + "${CMAKE_CURRENT_SOURCE_DIR}/preprocessor.hpp" + 320 +DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/preprocessor.py" +) + + ############################################################################### add_library(cruft-util ${UTIL_FILES}) target_link_libraries (cruft-util ${LIBS}) @@ -494,6 +514,7 @@ if (TESTS) point polynomial pool + preprocessor quaternion rand/buckets range diff --git a/coord/ops.hpp b/coord/ops.hpp index 3ee732e4..3b3c6f1b 100644 --- a/coord/ops.hpp +++ b/coord/ops.hpp @@ -21,9 +21,10 @@ #include "../debug.hpp" #include "../maths.hpp" -#include "../preprocessor.hpp" #include "../types/bits.hpp" +#include "../preprocessor.hpp" + #include #include #include diff --git a/introspection.hpp b/introspection.hpp index 67410f36..9b3808cf 100644 --- a/introspection.hpp +++ b/introspection.hpp @@ -174,7 +174,7 @@ namespace util { const char*, \ util::enum_traits<::NS::E>::value_count \ > PASTE(util::__enum_traits_,E)::names = { \ - MAP(STRINGIZE_LIST, __VA_ARGS__) \ + MAP0(STRINGIZE_LIST, __VA_ARGS__) \ }; diff --git a/io.cpp b/io.cpp index 704a437a..f984633b 100644 --- a/io.cpp +++ b/io.cpp @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright 2010-2016 Danny Robson + * Copyright 2010-2017 Danny Robson */ #include "io.hpp" diff --git a/json/flat.cpp.rl b/json/flat.cpp.rl index 0ca04ba3..8d03ff30 100644 --- a/json/flat.cpp.rl +++ b/json/flat.cpp.rl @@ -172,9 +172,7 @@ template \ std::vector> \ json::flat::parse (util::view); -MAP( - INSTANTIATE, - +MAP0(INSTANTIATE, std::string::iterator, std::string::const_iterator, const char* restrict, diff --git a/json/tree.cpp b/json/tree.cpp index 770511cb..b626520f 100644 --- a/json/tree.cpp +++ b/json/tree.cpp @@ -23,9 +23,10 @@ #include "../debug.hpp" #include "../io.hpp" #include "../maths.hpp" -#include "../preprocessor.hpp" #include "../stream.hpp" +#include "preprocessor.hpp" + #include #include #include @@ -226,9 +227,7 @@ template \ std::unique_ptr \ json::tree::parse (util::view); -MAP( - INSTANTIATE, - +MAP0(INSTANTIATE, std::string::iterator, std::string::const_iterator, const char* restrict, diff --git a/log.hpp b/log.hpp index aa30788c..da9da9e1 100644 --- a/log.hpp +++ b/log.hpp @@ -18,6 +18,7 @@ #define __UTIL_LOG_HPP #include "./nocopy.hpp" + #include "./preprocessor.hpp" #include @@ -45,7 +46,7 @@ namespace util { DEBUG /** debug-level messages */ }; - #define MAP_LEVEL_T(F) MAP(F, EMERGENCY, ALERT, CRITICAL, ERROR, WARN, NOTICE, INFO, DEBUG) + #define MAP_LEVEL_T(F) MAP0(F, EMERGENCY, ALERT, CRITICAL, ERROR, WARN, NOTICE, INFO, DEBUG) constexpr auto DEFAULT_LOG_LEVEL = NOTICE; diff --git a/preprocessor.hpp b/preprocessor.hpp deleted file mode 100644 index c43e5b52..00000000 --- a/preprocessor.hpp +++ /dev/null @@ -1,516 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Copyright 2012-2017 Danny Robson - */ - -#ifndef CRUFT_UTIL_PREPROCESSOR_HPP -#define CRUFT_UTIL_PREPROCESSOR_HPP - -//----------------------------------------------------------------------------- -// -// HERE BE DRAGONS. -// -// Don't use this code unless you need to do minor token pasting. -// Don't judge me... -// -//----------------------------------------------------------------------------- - - -/////////////////////////////////////////////////////////////////////////////// -// token concatenation operations. you should probably prefer PASTE over -// PASTE2. PASTE2 is defined purely so that PASTE can make use of this macro -// (because it clearly can't use itself). -// -// do not use PASTE_DETAIL directly. -#define PASTE_DETAIL(x, y) x##y -#define PASTE2(x, y) PASTE_DETAIL(x, y) - -#define PASTE_LIST(x,y) PASTE2(x,y), - -#define NAMESPACE_LIST(x,y) x::y, - -#define STRINGIZE_DETAIL(x) #x -#define STRINGIZE(x) STRINGIZE_DETAIL(x) - -#define STRINGIZE_LIST(x) STRINGIZE(x), - -#define STATIC_ASSERT(MSG) static_assert(false, MSG); - -/////////////////////////////////////////////////////////////////////////////// -// Varags functional style map -// -// Based off a technique seen on StackOverflow: -// http://stackoverflow.com/questions/11761703/overloading-macro-on-number-of-arguments - -#define REDUCE_2_01(F,X, ...) X -#define REDUCE_2_02(F,X,Y,...) F(X,Y) -#define REDUCE_2_03(F,X,Y,...) REDUCE_2_02(F,F(X,Y),__VA_ARGS__) -#define REDUCE_2_04(F,X,Y,...) REDUCE_2_03(F,F(X,Y),__VA_ARGS__) -#define REDUCE_2_05(F,X,Y,...) REDUCE_2_04(F,F(X,Y),__VA_ARGS__) -#define REDUCE_2_06(F,X,Y,...) REDUCE_2_05(F,F(X,Y),__VA_ARGS__) -#define REDUCE_2_07(F,X,Y,...) REDUCE_2_06(F,F(X,Y),__VA_ARGS__) -#define REDUCE_2_08(F,X,Y,...) REDUCE_2_07(F,F(X,Y),__VA_ARGS__) - - -//----------------------------------------------------------------------------- -#define MAP_0_01(F, X) F(X) -#define MAP_0_02(F, X, ...) F(X)MAP_0_01(F, __VA_ARGS__) -#define MAP_0_03(F, X, ...) F(X)MAP_0_02(F, __VA_ARGS__) -#define MAP_0_04(F, X, ...) F(X)MAP_0_03(F, __VA_ARGS__) -#define MAP_0_05(F, X, ...) F(X)MAP_0_04(F, __VA_ARGS__) -#define MAP_0_06(F, X, ...) F(X)MAP_0_05(F, __VA_ARGS__) -#define MAP_0_07(F, X, ...) F(X)MAP_0_06(F, __VA_ARGS__) -#define MAP_0_08(F, X, ...) F(X)MAP_0_07(F, __VA_ARGS__) - -#define MAP_0_09(F, X, ...) F(X)MAP_0_08(F, __VA_ARGS__) -#define MAP_0_10(F, X, ...) F(X)MAP_0_09(F, __VA_ARGS__) -#define MAP_0_11(F, X, ...) F(X)MAP_0_10(F, __VA_ARGS__) -#define MAP_0_12(F, X, ...) F(X)MAP_0_11(F, __VA_ARGS__) -#define MAP_0_13(F, X, ...) F(X)MAP_0_12(F, __VA_ARGS__) -#define MAP_0_14(F, X, ...) F(X)MAP_0_13(F, __VA_ARGS__) -#define MAP_0_15(F, X, ...) F(X)MAP_0_14(F, __VA_ARGS__) -#define MAP_0_16(F, X, ...) F(X)MAP_0_15(F, __VA_ARGS__) - -#define MAP_0_17(F, X, ...) F(X)MAP_0_16(F, __VA_ARGS__) -#define MAP_0_18(F, X, ...) F(X)MAP_0_17(F, __VA_ARGS__) -#define MAP_0_19(F, X, ...) F(X)MAP_0_18(F, __VA_ARGS__) -#define MAP_0_20(F, X, ...) F(X)MAP_0_19(F, __VA_ARGS__) -#define MAP_0_21(F, X, ...) F(X)MAP_0_20(F, __VA_ARGS__) -#define MAP_0_22(F, X, ...) F(X)MAP_0_21(F, __VA_ARGS__) -#define MAP_0_23(F, X, ...) F(X)MAP_0_22(F, __VA_ARGS__) -#define MAP_0_24(F, X, ...) F(X)MAP_0_23(F, __VA_ARGS__) - -#define MAP_0_25(F, X, ...) F(X)MAP_0_24(F, __VA_ARGS__) -#define MAP_0_26(F, X, ...) F(X)MAP_0_25(F, __VA_ARGS__) -#define MAP_0_27(F, X, ...) F(X)MAP_0_26(F, __VA_ARGS__) -#define MAP_0_28(F, X, ...) F(X)MAP_0_27(F, __VA_ARGS__) -#define MAP_0_29(F, X, ...) F(X)MAP_0_28(F, __VA_ARGS__) -#define MAP_0_30(F, X, ...) F(X)MAP_0_29(F, __VA_ARGS__) -#define MAP_0_31(F, X, ...) F(X)MAP_0_30(F, __VA_ARGS__) -#define MAP_0_32(F, X, ...) F(X)MAP_0_31(F, __VA_ARGS__) - -#define MAP_0_33(F, X, ...) F(X)MAP_0_32(F, __VA_ARGS__) -#define MAP_0_34(F, X, ...) F(X)MAP_0_33(F, __VA_ARGS__) -#define MAP_0_35(F, X, ...) F(X)MAP_0_34(F, __VA_ARGS__) -#define MAP_0_36(F, X, ...) F(X)MAP_0_35(F, __VA_ARGS__) -#define MAP_0_37(F, X, ...) F(X)MAP_0_36(F, __VA_ARGS__) -#define MAP_0_38(F, X, ...) F(X)MAP_0_37(F, __VA_ARGS__) -#define MAP_0_39(F, X, ...) F(X)MAP_0_38(F, __VA_ARGS__) -#define MAP_0_40(F, X, ...) F(X)MAP_0_39(F, __VA_ARGS__) - -#define MAP_0_41(F, X, ...) F(X)MAP_0_40(F, __VA_ARGS__) -#define MAP_0_42(F, X, ...) F(X)MAP_0_41(F, __VA_ARGS__) -#define MAP_0_43(F, X, ...) F(X)MAP_0_42(F, __VA_ARGS__) -#define MAP_0_44(F, X, ...) F(X)MAP_0_43(F, __VA_ARGS__) -#define MAP_0_45(F, X, ...) F(X)MAP_0_44(F, __VA_ARGS__) -#define MAP_0_46(F, X, ...) F(X)MAP_0_45(F, __VA_ARGS__) -#define MAP_0_47(F, X, ...) F(X)MAP_0_46(F, __VA_ARGS__) -#define MAP_0_48(F, X, ...) F(X)MAP_0_47(F, __VA_ARGS__) - -#define MAP_0_49(F, X, ...) F(X)MAP_0_48(F, __VA_ARGS__) -#define MAP_0_50(F, X, ...) F(X)MAP_0_49(F, __VA_ARGS__) -#define MAP_0_51(F, X, ...) F(X)MAP_0_50(F, __VA_ARGS__) -#define MAP_0_52(F, X, ...) F(X)MAP_0_51(F, __VA_ARGS__) -#define MAP_0_53(F, X, ...) F(X)MAP_0_52(F, __VA_ARGS__) -#define MAP_0_54(F, X, ...) F(X)MAP_0_53(F, __VA_ARGS__) -#define MAP_0_55(F, X, ...) F(X)MAP_0_54(F, __VA_ARGS__) -#define MAP_0_56(F, X, ...) F(X)MAP_0_55(F, __VA_ARGS__) - -#define MAP_0_57(F, X, ...) F(X)MAP_0_56(F, __VA_ARGS__) -#define MAP_0_58(F, X, ...) F(X)MAP_0_57(F, __VA_ARGS__) -#define MAP_0_59(F, X, ...) F(X)MAP_0_58(F, __VA_ARGS__) -#define MAP_0_60(F, X, ...) F(X)MAP_0_59(F, __VA_ARGS__) -#define MAP_0_61(F, X, ...) F(X)MAP_0_60(F, __VA_ARGS__) -#define MAP_0_62(F, X, ...) F(X)MAP_0_61(F, __VA_ARGS__) -#define MAP_0_63(F, X, ...) F(X)MAP_0_62(F, __VA_ARGS__) -#define MAP_0_64(F, X, ...) F(X)MAP_0_63(F, __VA_ARGS__) - -#define MAP_0_65(F, X, ...) F(X)MAP_0_64(F, __VA_ARGS__) -#define MAP_0_66(F, X, ...) F(X)MAP_0_65(F, __VA_ARGS__) -#define MAP_0_67(F, X, ...) F(X)MAP_0_66(F, __VA_ARGS__) -#define MAP_0_68(F, X, ...) F(X)MAP_0_67(F, __VA_ARGS__) -#define MAP_0_69(F, X, ...) F(X)MAP_0_68(F, __VA_ARGS__) -#define MAP_0_70(F, X, ...) F(X)MAP_0_69(F, __VA_ARGS__) -#define MAP_0_71(F, X, ...) F(X)MAP_0_70(F, __VA_ARGS__) -#define MAP_0_72(F, X, ...) F(X)MAP_0_71(F, __VA_ARGS__) - -#define MAP_0_73(F, X, ...) F(X)MAP_0_72(F, __VA_ARGS__) -#define MAP_0_74(F, X, ...) F(X)MAP_0_73(F, __VA_ARGS__) -#define MAP_0_75(F, X, ...) F(X)MAP_0_74(F, __VA_ARGS__) -#define MAP_0_76(F, X, ...) F(X)MAP_0_75(F, __VA_ARGS__) -#define MAP_0_77(F, X, ...) F(X)MAP_0_76(F, __VA_ARGS__) -#define MAP_0_78(F, X, ...) F(X)MAP_0_77(F, __VA_ARGS__) -#define MAP_0_79(F, X, ...) F(X)MAP_0_78(F, __VA_ARGS__) -#define MAP_0_80(F, X, ...) F(X)MAP_0_79(F, __VA_ARGS__) - -#define MAP_0_81(F, X, ...) F(X)MAP_0_80(F, __VA_ARGS__) -#define MAP_0_82(F, X, ...) F(X)MAP_0_81(F, __VA_ARGS__) -#define MAP_0_83(F, X, ...) F(X)MAP_0_82(F, __VA_ARGS__) -#define MAP_0_84(F, X, ...) F(X)MAP_0_83(F, __VA_ARGS__) -#define MAP_0_85(F, X, ...) F(X)MAP_0_84(F, __VA_ARGS__) -#define MAP_0_86(F, X, ...) F(X)MAP_0_85(F, __VA_ARGS__) -#define MAP_0_87(F, X, ...) F(X)MAP_0_86(F, __VA_ARGS__) -#define MAP_0_88(F, X, ...) F(X)MAP_0_87(F, __VA_ARGS__) - -#define MAP_0_89(F, X, ...) F(X)MAP_0_88(F, __VA_ARGS__) -#define MAP_0_90(F, X, ...) F(X)MAP_0_89(F, __VA_ARGS__) -#define MAP_0_91(F, X, ...) F(X)MAP_0_90(F, __VA_ARGS__) -#define MAP_0_92(F, X, ...) F(X)MAP_0_91(F, __VA_ARGS__) -#define MAP_0_93(F, X, ...) F(X)MAP_0_92(F, __VA_ARGS__) -#define MAP_0_94(F, X, ...) F(X)MAP_0_93(F, __VA_ARGS__) -#define MAP_0_95(F, X, ...) F(X)MAP_0_94(F, __VA_ARGS__) -#define MAP_0_96(F, X, ...) F(X)MAP_0_95(F, __VA_ARGS__) - - -//----------------------------------------------------------------------------- -#define MAP_1_01(F, A, X) F(A, X) -#define MAP_1_02(F, A, X, ...) F(A, X)MAP_1_01(F, A, __VA_ARGS__) -#define MAP_1_03(F, A, X, ...) F(A, X)MAP_1_02(F, A, __VA_ARGS__) -#define MAP_1_04(F, A, X, ...) F(A, X)MAP_1_03(F, A, __VA_ARGS__) -#define MAP_1_05(F, A, X, ...) F(A, X)MAP_1_04(F, A, __VA_ARGS__) -#define MAP_1_06(F, A, X, ...) F(A, X)MAP_1_05(F, A, __VA_ARGS__) -#define MAP_1_07(F, A, X, ...) F(A, X)MAP_1_06(F, A, __VA_ARGS__) -#define MAP_1_08(F, A, X, ...) F(A, X)MAP_1_07(F, A, __VA_ARGS__) - -#define MAP_1_09(F, A, X, ...) F(A, X)MAP_1_08(F, A, __VA_ARGS__) -#define MAP_1_10(F, A, X, ...) F(A, X)MAP_1_09(F, A, __VA_ARGS__) -#define MAP_1_11(F, A, X, ...) F(A, X)MAP_1_10(F, A, __VA_ARGS__) -#define MAP_1_12(F, A, X, ...) F(A, X)MAP_1_11(F, A, __VA_ARGS__) -#define MAP_1_13(F, A, X, ...) F(A, X)MAP_1_12(F, A, __VA_ARGS__) -#define MAP_1_14(F, A, X, ...) F(A, X)MAP_1_13(F, A, __VA_ARGS__) -#define MAP_1_15(F, A, X, ...) F(A, X)MAP_1_14(F, A, __VA_ARGS__) -#define MAP_1_16(F, A, X, ...) F(A, X)MAP_1_15(F, A, __VA_ARGS__) - -#define MAP_1_17(F, A, X, ...) F(A, X)MAP_1_16(F, A, __VA_ARGS__) -#define MAP_1_18(F, A, X, ...) F(A, X)MAP_1_17(F, A, __VA_ARGS__) -#define MAP_1_19(F, A, X, ...) F(A, X)MAP_1_18(F, A, __VA_ARGS__) -#define MAP_1_20(F, A, X, ...) F(A, X)MAP_1_19(F, A, __VA_ARGS__) -#define MAP_1_21(F, A, X, ...) F(A, X)MAP_1_20(F, A, __VA_ARGS__) -#define MAP_1_22(F, A, X, ...) F(A, X)MAP_1_21(F, A, __VA_ARGS__) -#define MAP_1_23(F, A, X, ...) F(A, X)MAP_1_22(F, A, __VA_ARGS__) -#define MAP_1_24(F, A, X, ...) F(A, X)MAP_1_23(F, A, __VA_ARGS__) - -#define MAP_1_25(F, A, X, ...) F(A, X)MAP_1_24(F, A, __VA_ARGS__) -#define MAP_1_26(F, A, X, ...) F(A, X)MAP_1_25(F, A, __VA_ARGS__) -#define MAP_1_27(F, A, X, ...) F(A, X)MAP_1_26(F, A, __VA_ARGS__) -#define MAP_1_28(F, A, X, ...) F(A, X)MAP_1_27(F, A, __VA_ARGS__) -#define MAP_1_29(F, A, X, ...) F(A, X)MAP_1_28(F, A, __VA_ARGS__) -#define MAP_1_30(F, A, X, ...) F(A, X)MAP_1_29(F, A, __VA_ARGS__) -#define MAP_1_31(F, A, X, ...) F(A, X)MAP_1_30(F, A, __VA_ARGS__) -#define MAP_1_32(F, A, X, ...) F(A, X)MAP_1_31(F, A, __VA_ARGS__) - -#define MAP_1_33(F, A, X, ...) F(A, X)MAP_1_32(F, A, __VA_ARGS__) -#define MAP_1_34(F, A, X, ...) F(A, X)MAP_1_33(F, A, __VA_ARGS__) -#define MAP_1_35(F, A, X, ...) F(A, X)MAP_1_34(F, A, __VA_ARGS__) -#define MAP_1_36(F, A, X, ...) F(A, X)MAP_1_35(F, A, __VA_ARGS__) -#define MAP_1_37(F, A, X, ...) F(A, X)MAP_1_36(F, A, __VA_ARGS__) -#define MAP_1_38(F, A, X, ...) F(A, X)MAP_1_37(F, A, __VA_ARGS__) -#define MAP_1_39(F, A, X, ...) F(A, X)MAP_1_38(F, A, __VA_ARGS__) -#define MAP_1_40(F, A, X, ...) F(A, X)MAP_1_39(F, A, __VA_ARGS__) - -#define MAP_1_41(F, A, X, ...) F(A, X)MAP_1_40(F, A, __VA_ARGS__) -#define MAP_1_42(F, A, X, ...) F(A, X)MAP_1_41(F, A, __VA_ARGS__) -#define MAP_1_43(F, A, X, ...) F(A, X)MAP_1_42(F, A, __VA_ARGS__) -#define MAP_1_44(F, A, X, ...) F(A, X)MAP_1_43(F, A, __VA_ARGS__) -#define MAP_1_45(F, A, X, ...) F(A, X)MAP_1_44(F, A, __VA_ARGS__) -#define MAP_1_46(F, A, X, ...) F(A, X)MAP_1_45(F, A, __VA_ARGS__) -#define MAP_1_47(F, A, X, ...) F(A, X)MAP_1_46(F, A, __VA_ARGS__) -#define MAP_1_48(F, A, X, ...) F(A, X)MAP_1_47(F, A, __VA_ARGS__) - -#define MAP_1_49(F, A, X, ...) F(A, X)MAP_1_48(F, A, __VA_ARGS__) -#define MAP_1_50(F, A, X, ...) F(A, X)MAP_1_49(F, A, __VA_ARGS__) -#define MAP_1_51(F, A, X, ...) F(A, X)MAP_1_50(F, A, __VA_ARGS__) -#define MAP_1_52(F, A, X, ...) F(A, X)MAP_1_51(F, A, __VA_ARGS__) -#define MAP_1_53(F, A, X, ...) F(A, X)MAP_1_52(F, A, __VA_ARGS__) -#define MAP_1_54(F, A, X, ...) F(A, X)MAP_1_53(F, A, __VA_ARGS__) -#define MAP_1_55(F, A, X, ...) F(A, X)MAP_1_54(F, A, __VA_ARGS__) -#define MAP_1_56(F, A, X, ...) F(A, X)MAP_1_55(F, A, __VA_ARGS__) - -#define MAP_1_57(F, A, X, ...) F(A, X)MAP_1_56(F, A, __VA_ARGS__) -#define MAP_1_58(F, A, X, ...) F(A, X)MAP_1_57(F, A, __VA_ARGS__) -#define MAP_1_59(F, A, X, ...) F(A, X)MAP_1_58(F, A, __VA_ARGS__) -#define MAP_1_60(F, A, X, ...) F(A, X)MAP_1_59(F, A, __VA_ARGS__) -#define MAP_1_61(F, A, X, ...) F(A, X)MAP_1_60(F, A, __VA_ARGS__) -#define MAP_1_62(F, A, X, ...) F(A, X)MAP_1_61(F, A, __VA_ARGS__) -#define MAP_1_63(F, A, X, ...) F(A, X)MAP_1_62(F, A, __VA_ARGS__) -#define MAP_1_64(F, A, X, ...) F(A, X)MAP_1_63(F, A, __VA_ARGS__) - -#define MAP_1_65(F, A, X, ...) F(A, X)MAP_1_64(F, A, __VA_ARGS__) -#define MAP_1_66(F, A, X, ...) F(A, X)MAP_1_65(F, A, __VA_ARGS__) -#define MAP_1_67(F, A, X, ...) F(A, X)MAP_1_66(F, A, __VA_ARGS__) -#define MAP_1_68(F, A, X, ...) F(A, X)MAP_1_67(F, A, __VA_ARGS__) -#define MAP_1_69(F, A, X, ...) F(A, X)MAP_1_68(F, A, __VA_ARGS__) -#define MAP_1_70(F, A, X, ...) F(A, X)MAP_1_69(F, A, __VA_ARGS__) -#define MAP_1_71(F, A, X, ...) F(A, X)MAP_1_70(F, A, __VA_ARGS__) -#define MAP_1_72(F, A, X, ...) F(A, X)MAP_1_71(F, A, __VA_ARGS__) - -#define MAP_1_73(F, A, X, ...) F(A, X)MAP_1_72(F, A, __VA_ARGS__) -#define MAP_1_74(F, A, X, ...) F(A, X)MAP_1_73(F, A, __VA_ARGS__) -#define MAP_1_75(F, A, X, ...) F(A, X)MAP_1_74(F, A, __VA_ARGS__) -#define MAP_1_76(F, A, X, ...) F(A, X)MAP_1_75(F, A, __VA_ARGS__) -#define MAP_1_77(F, A, X, ...) F(A, X)MAP_1_76(F, A, __VA_ARGS__) -#define MAP_1_78(F, A, X, ...) F(A, X)MAP_1_77(F, A, __VA_ARGS__) -#define MAP_1_79(F, A, X, ...) F(A, X)MAP_1_78(F, A, __VA_ARGS__) -#define MAP_1_80(F, A, X, ...) F(A, X)MAP_1_79(F, A, __VA_ARGS__) - -#define MAP_1_81(F, A, X, ...) F(A, X)MAP_1_80(F, A, __VA_ARGS__) -#define MAP_1_82(F, A, X, ...) F(A, X)MAP_1_81(F, A, __VA_ARGS__) -#define MAP_1_83(F, A, X, ...) F(A, X)MAP_1_82(F, A, __VA_ARGS__) -#define MAP_1_84(F, A, X, ...) F(A, X)MAP_1_83(F, A, __VA_ARGS__) -#define MAP_1_85(F, A, X, ...) F(A, X)MAP_1_84(F, A, __VA_ARGS__) -#define MAP_1_86(F, A, X, ...) F(A, X)MAP_1_85(F, A, __VA_ARGS__) -#define MAP_1_87(F, A, X, ...) F(A, X)MAP_1_86(F, A, __VA_ARGS__) -#define MAP_1_88(F, A, X, ...) F(A, X)MAP_1_87(F, A, __VA_ARGS__) - -#define MAP_1_89(F, A, X, ...) F(A, X)MAP_1_88(F, A, __VA_ARGS__) -#define MAP_1_90(F, A, X, ...) F(A, X)MAP_1_89(F, A, __VA_ARGS__) -#define MAP_1_91(F, A, X, ...) F(A, X)MAP_1_90(F, A, __VA_ARGS__) -#define MAP_1_92(F, A, X, ...) F(A, X)MAP_1_91(F, A, __VA_ARGS__) -#define MAP_1_93(F, A, X, ...) F(A, X)MAP_1_92(F, A, __VA_ARGS__) -#define MAP_1_94(F, A, X, ...) F(A, X)MAP_1_93(F, A, __VA_ARGS__) -#define MAP_1_95(F, A, X, ...) F(A, X)MAP_1_94(F, A, __VA_ARGS__) -#define MAP_1_96(F, A, X, ...) F(A, X)MAP_1_95(F, A, __VA_ARGS__) - - -//----------------------------------------------------------------------------- -// Uses the sliding pairs dispatch technique: by passing __VA_ARGS__ as the -// first set of variables and appending (reverse orderred) names of the -// corresponding macros, we get the name of the correct arity macro. -// -// Ensure this is called with at least N+2 parameters otherwise GCC in -// particular will complain about requiring at least one value for varargs -#define ARITY_DISPATCH( \ - _01,_02,_03,_04,_05,_06,_07,_08, \ - _09,_10,_11,_12,_13,_14,_15,_16, \ - _17,_18,_19,_20,_21,_22,_23,_24, \ - _25,_26,_27,_28,_29,_30,_31,_32, \ - _33,_34,_35,_36,_37,_38,_39,_40, \ - _41,_42,_43,_44,_45,_46,_47,_48, \ - _49,_50,_51,_52,_53,_54,_55,_56, \ - _57,_58,_59,_60,_61,_62,_63,_64, \ - _65,_66,_67,_68,_69,_70,_71,_72, \ - _73,_74,_75,_76,_77,_78,_79,_80, \ - _81,_82,_83,_84,_85,_86,_87,_88, \ - _89,_90,_91,_92,_93,_94,_95,_96, \ - NAME,... \ -) NAME - - -//----------------------------------------------------------------------------- -// reduces a series of values by repeated application of some macro 'func'. -// -// useful for things like variadic 'paste' -// -// it's only implemented for up to 8 arguments (because that's all you should -// need you monster...) but we need to have enough arguments to make -// ARITY_DISPATCH work so we fill it with nonces. -#define REDUCE(FUNC,...) \ -ARITY_DISPATCH(__VA_ARGS__, \ - _96, _95, _94, _93, _92, _91, _90, _89, \ - _88, _87, _86, _85, _84, _83, _82, _81, \ - _80, _79, _78, _77, _76, _75, _74, _73, \ - _72, _71, _70, _69, _68, _67, _66, _65, \ - _64, _63, _62, _61, _60, _59, _58, _57, \ - _56, _55, _54, _53, _52, _51, _50, _49, \ - _48, _47, _46, _45, _44, _43, _42, _41, \ - _40, _39, _38, _37, _36, _35, _34, _33, \ - _32, _31, _30, _29, _28, _27, _26, _25, \ - _24, _23, _22, _21, _20, _19, _18, _17, \ - _16, _15, _14, _13, _12, _11, _10, _09, \ - REDUCE_2_08, REDUCE_2_07, REDUCE_2_06, REDUCE_2_05, \ - REDUCE_2_04, REDUCE_2_03, REDUCE_2_02, REDUCE_2_01, \ - STATIC_ASSERT("invalid arity for REDUCE") \ -)(FUNC,__VA_ARGS__) - - -// concatenate a series of tokens -#define PASTE(...) REDUCE(PASTE2,__VA_ARGS__) - - -// Map a macro across __VA_ARGS__. Can be easily expanded, but has non-obvious -// failure mode when supported arity is exceeded. -// -// Don't use this, unless you really need the stringize operator, or other -// macro magic. -// -// Just use templates. Really... -#define MAP(FUNC,...) \ -ARITY_DISPATCH(__VA_ARGS__, \ - MAP_0_96, MAP_0_95, MAP_0_94, MAP_0_93, MAP_0_92, MAP_0_91, MAP_0_90, MAP_0_89, \ - MAP_0_88, MAP_0_87, MAP_0_86, MAP_0_85, MAP_0_84, MAP_0_83, MAP_0_82, MAP_0_81, \ - MAP_0_80, MAP_0_79, MAP_0_78, MAP_0_77, MAP_0_76, MAP_0_75, MAP_0_74, MAP_0_73, \ - MAP_0_72, MAP_0_71, MAP_0_70, MAP_0_69, MAP_0_68, MAP_0_67, MAP_0_66, MAP_0_65, \ - MAP_0_64, MAP_0_63, MAP_0_62, MAP_0_61, MAP_0_60, MAP_0_59, MAP_0_58, MAP_0_57, \ - MAP_0_56, MAP_0_55, MAP_0_54, MAP_0_53, MAP_0_52, MAP_0_51, MAP_0_50, MAP_0_49, \ - MAP_0_48, MAP_0_47, MAP_0_46, MAP_0_45, MAP_0_44, MAP_0_43, MAP_0_42, MAP_0_41, \ - MAP_0_40, MAP_0_39, MAP_0_38, MAP_0_37, MAP_0_36, MAP_0_35, MAP_0_34, MAP_0_33, \ - MAP_0_32, MAP_0_31, MAP_0_30, MAP_0_29, MAP_0_28, MAP_0_27, MAP_0_26, MAP_0_25, \ - MAP_0_24, MAP_0_23, MAP_0_22, MAP_0_21, MAP_0_20, MAP_0_19, MAP_0_18, MAP_0_17, \ - MAP_0_16, MAP_0_15, MAP_0_14, MAP_0_13, MAP_0_12, MAP_0_11, MAP_0_10, MAP_0_09, \ - MAP_0_08, MAP_0_07, MAP_0_06, MAP_0_05, MAP_0_04, MAP_0_03, MAP_0_02, MAP_0_01, \ - STATIC_ASSERT("invalid arity for MAP") \ -)(FUNC, __VA_ARGS__) - - -// Note: this is one fewer argument than MAP because of the leading parameter -// passed to all invokations. -#define MAP1(FUNC,...) \ -ARITY_DISPATCH(__VA_ARGS__, \ - MAP_1_95, MAP_1_94, MAP_1_93, MAP_1_92, MAP_1_91, MAP_1_90, MAP_1_89, \ - MAP_1_88, MAP_1_87, MAP_1_86, MAP_1_85, MAP_1_84, MAP_1_83, MAP_1_82, MAP_1_81, \ - MAP_1_80, MAP_1_79, MAP_1_78, MAP_1_77, MAP_1_76, MAP_1_75, MAP_1_74, MAP_1_73, \ - MAP_1_72, MAP_1_71, MAP_1_70, MAP_1_69, MAP_1_68, MAP_1_67, MAP_1_66, MAP_1_65, \ - MAP_1_64, MAP_1_63, MAP_1_62, MAP_1_61, MAP_1_60, MAP_1_59, MAP_1_58, MAP_1_57, \ - MAP_1_56, MAP_1_55, MAP_1_54, MAP_1_53, MAP_1_52, MAP_1_51, MAP_1_50, MAP_1_49, \ - MAP_1_48, MAP_1_47, MAP_1_46, MAP_1_45, MAP_1_44, MAP_1_43, MAP_1_42, MAP_1_41, \ - MAP_1_40, MAP_1_39, MAP_1_38, MAP_1_37, MAP_1_36, MAP_1_35, MAP_1_34, MAP_1_33, \ - MAP_1_32, MAP_1_31, MAP_1_30, MAP_1_29, MAP_1_28, MAP_1_27, MAP_1_26, MAP_1_25, \ - MAP_1_24, MAP_1_23, MAP_1_22, MAP_1_21, MAP_1_20, MAP_1_19, MAP_1_18, MAP_1_17, \ - MAP_1_16, MAP_1_15, MAP_1_14, MAP_1_13, MAP_1_12, MAP_1_11, MAP_1_10, MAP_1_09, \ - MAP_1_08, MAP_1_07, MAP_1_06, MAP_1_05, MAP_1_04, MAP_1_03, MAP_1_02, MAP_1_01, \ - STATIC_ASSERT("invalid arity for MAP1") \ -)(FUNC, __VA_ARGS__) - - - -#define LITERAL_00 0 -#define LITERAL_01 1 -#define LITERAL_02 2 -#define LITERAL_03 3 -#define LITERAL_04 4 -#define LITERAL_05 5 -#define LITERAL_06 6 -#define LITERAL_07 7 -#define LITERAL_08 8 -#define LITERAL_09 9 -#define LITERAL_10 10 -#define LITERAL_11 11 -#define LITERAL_12 12 -#define LITERAL_13 13 -#define LITERAL_14 14 -#define LITERAL_15 15 -#define LITERAL_16 16 -#define LITERAL_17 17 -#define LITERAL_18 18 -#define LITERAL_19 19 -#define LITERAL_20 20 -#define LITERAL_21 21 -#define LITERAL_22 22 -#define LITERAL_23 23 -#define LITERAL_24 24 -#define LITERAL_25 25 -#define LITERAL_26 26 -#define LITERAL_27 27 -#define LITERAL_28 28 -#define LITERAL_29 29 -#define LITERAL_30 30 -#define LITERAL_31 31 -#define LITERAL_32 32 -#define LITERAL_33 33 -#define LITERAL_34 34 -#define LITERAL_35 35 -#define LITERAL_36 36 -#define LITERAL_37 37 -#define LITERAL_38 38 -#define LITERAL_39 39 -#define LITERAL_40 40 -#define LITERAL_41 41 -#define LITERAL_42 42 -#define LITERAL_43 43 -#define LITERAL_44 44 -#define LITERAL_45 45 -#define LITERAL_46 46 -#define LITERAL_47 47 -#define LITERAL_48 48 -#define LITERAL_49 49 -#define LITERAL_50 50 -#define LITERAL_51 51 -#define LITERAL_52 52 -#define LITERAL_53 53 -#define LITERAL_54 54 -#define LITERAL_55 55 -#define LITERAL_56 56 -#define LITERAL_57 57 -#define LITERAL_58 58 -#define LITERAL_59 59 -#define LITERAL_60 60 -#define LITERAL_61 61 -#define LITERAL_62 62 -#define LITERAL_63 63 -#define LITERAL_64 64 -#define LITERAL_65 65 -#define LITERAL_66 66 -#define LITERAL_67 67 -#define LITERAL_68 68 -#define LITERAL_69 69 -#define LITERAL_70 70 -#define LITERAL_71 71 -#define LITERAL_72 72 -#define LITERAL_73 73 -#define LITERAL_74 74 -#define LITERAL_75 75 -#define LITERAL_76 76 -#define LITERAL_77 77 -#define LITERAL_78 78 -#define LITERAL_79 79 -#define LITERAL_80 80 -#define LITERAL_81 81 -#define LITERAL_82 82 -#define LITERAL_83 83 -#define LITERAL_84 84 -#define LITERAL_85 85 -#define LITERAL_86 86 -#define LITERAL_87 87 -#define LITERAL_88 88 -#define LITERAL_89 89 -#define LITERAL_90 90 -#define LITERAL_91 91 -#define LITERAL_92 92 -#define LITERAL_93 93 -#define LITERAL_94 94 -#define LITERAL_95 95 -#define LITERAL_96 96 - - -#define VA_ARGS_COUNT(...) \ -ARITY_DISPATCH(__VA_ARGS__, \ - LITERAL_96, LITERAL_95, LITERAL_94, LITERAL_93, \ - LITERAL_92, LITERAL_91, LITERAL_90, LITERAL_89, \ - LITERAL_88, LITERAL_87, LITERAL_86, LITERAL_85, \ - LITERAL_84, LITERAL_83, LITERAL_82, LITERAL_81, \ - LITERAL_80, LITERAL_79, LITERAL_78, LITERAL_77, \ - LITERAL_76, LITERAL_75, LITERAL_74, LITERAL_73, \ - LITERAL_72, LITERAL_71, LITERAL_70, LITERAL_69, \ - LITERAL_68, LITERAL_67, LITERAL_66, LITERAL_65, \ - LITERAL_64, LITERAL_63, LITERAL_62, LITERAL_61, \ - LITERAL_60, LITERAL_59, LITERAL_58, LITERAL_57, \ - LITERAL_56, LITERAL_55, LITERAL_54, LITERAL_53, \ - LITERAL_52, LITERAL_51, LITERAL_50, LITERAL_49, \ - LITERAL_48, LITERAL_47, LITERAL_46, LITERAL_45, \ - LITERAL_44, LITERAL_43, LITERAL_42, LITERAL_41, \ - LITERAL_40, LITERAL_39, LITERAL_38, LITERAL_37, \ - LITERAL_36, LITERAL_35, LITERAL_34, LITERAL_33, \ - LITERAL_32, LITERAL_31, LITERAL_30, LITERAL_29, \ - LITERAL_28, LITERAL_27, LITERAL_26, LITERAL_25, \ - LITERAL_24, LITERAL_23, LITERAL_22, LITERAL_21, \ - LITERAL_20, LITERAL_19, LITERAL_18, LITERAL_17, \ - LITERAL_16, LITERAL_15, LITERAL_14, LITERAL_13, \ - LITERAL_12, LITERAL_11, LITERAL_10, LITERAL_09, \ - LITERAL_08, LITERAL_07, LITERAL_06, LITERAL_05, \ - LITERAL_04, LITERAL_03, LITERAL_02, LITERAL_01, \ - STATIC_ASSERT("invalid value for VA_ARGS_COUNT")\ -) - - -#endif diff --git a/preprocessor.py b/preprocessor.py new file mode 100755 index 00000000..d52a6131 --- /dev/null +++ b/preprocessor.py @@ -0,0 +1,202 @@ +#!/usr/bin/python3 + +import itertools + + +############################################################################### +def chunks(values, size): + it = iter(values) + item = list(itertools.islice(it, size)) + + while item: + yield item + item = list(itertools.islice(it, size)) + + +############################################################################### +# Construct a variadic macro of the form: +# +# ARITY_DISPATCH(_0001, _0002, NAME, ...) NAME +# +# Where the numbered arguments is equal to the predefined maximum arity. +def generate_dispatch(num): + values = itertools.chain( + ("_%04u" % n for n in range (1, num+1)), + ["NAME"] + ) + + yield "#define ARITY_DISPATCH(\\" + for group in chunks(values, 8): + yield ", ".join(group) + ", \\" + yield "...) NAME" + + +############################################################################### +# Construct a variadic macro of the form: +# +# define REDUCE_1_0002(F,X,Y) F(X,Y) +# define REDUCE_1_0003(F,X,Y,...) REDUCE_2_0002(F,F(X,Y),__VA_ARGS__) +# define REDUCE_1_0004(F,X,Y,...) REDUCE_2_0003(F,F(X,Y),__VA_ARGS__) +# +# and so on +# +# We do not provide a definition for REDUCE_1_0000 because it does not +# actually reduce anything. Instead we define it as a static_assert to +# simplify the general dispatch generation code. +# +# The macro is defined as if it were arity 1, because the dispatch generation +# code operates in terms of the tail call and offsets the dispatch arguments +# by the arity. +def generate_reduce(num): + yield '#define REDUCE_1_0000(...) STATIC_ASSERT("REDUCE requires at least two arguments")' + yield "#define REDUCE_1_0001(F,X,Y) F(X,Y)" + + for n in range(2, num): + yield "#define REDUCE_1_%04u(F,X,Y,...) REDUCE_1_%04u(F,F(X,Y),__VA_ARGS__)" % (n, n - 1) + + raise StopIteration + + +############################################################################### +# Generate a variadic macro of the form: +# +# define MAP_ARITY_0000(F,A,B) F(A,B) +# define MAP_ARITY_0001(F,A,B,...) F(X)(MAP_0000_0000(F,A,B,__VA_ARGS___) +# define MAP_ARITY_0002(F,A,B,...) F(X)(MAP_0000_0001(F,A,B,__VA_ARGS___) +# +# and so on... +# +# Note: the arguments A, B, etc are replaced with a quantity of arguments +# indicated by the `arity' parameter. +def generate_map(num, arity): + args = ",".join("ARG%02u" % n for n in range(arity)) + if args: + args += ',' + yield "#define MAP_%(arity)u_0001(F,%(args)sX) F(%(args)sX)" % { 'arity': arity, 'args': args } + + for n in range(2, num): + yield "#define %(curr)s(F,%(args)sX,...) F(%(args)sX)%(next)s(F,%(args)s__VA_ARGS__)" % { + 'curr': 'MAP_%(arity)u_%(index)04u' % { 'arity': arity, 'index': n }, + 'next': 'MAP_%(arity)u_%(index)04u' % { 'arity': arity, 'index': n - 1 }, + 'arity': arity, + 'args': args, + } + + raise StopIteration + + +##----------------------------------------------------------------------------- +def dispatch(name, num, arity): + yield "#define %(name)s%(arity)u(FUNC,...)\\" % { 'name': name, 'arity': arity } + yield "ARITY_DISPATCH(__VA_ARGS__,\\" + + for group in chunks(range(num-arity,0,-1), 4): + yield ",".join ( + "%(name)s_%(arity)u_%(n)04u" % { + 'name': name, + 'arity': arity, + 'n': n + } for n in group + ) + ",\\" + + yield ', STATIC_ASSERT("invalid arity for %s")\\' % name + yield ')(FUNC,__VA_ARGS__)' + + +############################################################################### +def generate_argcount(num): + yield "#define VA_ARGS_COUNT(...)\\" + yield "ARITY_DISPATCH(__VA_ARGS__,\\" + + literals = ",".join(str(n) for n in range(num,0,-1)) + for group in chunks(range(num, 0, -1), 4): + yield ", ".join('% 4u' % g for g in group) + ',\\' + + yield ', STATIC_ASSERT("invalid value for VA_ARGS_COUNT"))' + + +############################################################################### +import argparse + + +##----------------------------------------------------------------------------- +if __name__ == '__main__': + #logging.getLogger().setLevel(logging.INFO) + + parser = argparse.ArgumentParser(description='Generate variadic macro functions') + parser.add_argument('dst', type=str, help='the output path for the header') + parser.add_argument('num', type=int, help='the maximum argument count') + + args = parser.parse_args() + + dst = open(args.dst, 'w') + num = args.num + arity = 3 + + dst.write("""\ +#ifndef CRUFT_UTIL_PREPROCESSOR_HPP +#define CRUFT_UTIL_PREPROCESSOR_HPP + +/////////////////////////////////////////////////////////////////////////////// +// +// This is autogenerated code, do not modify. Instead, look at preprocessor.py +// +/////////////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////////////// +// Here be dragons. For the love of God, only use these macros for token +// pasting applications. Don't judge me... + + +/////////////////////////////////////////////////////////////////////////////// +// Token concatenation wrapper that prevents macro expansion. You should not +// be using this outside of this header file (and probably not even then for +// the most part). +#define PASTE_DETAIL(x, y) x##y + +// A token concatenation wrapper. You should prefer PASTE over PASTE2. This +// is defined purely so that PASTE (defined laterR) has something to give +// REDUCE1. +#define PASTE2(x,y) PASTE_DETAIL(x,y) + +// Pair token concatenation with a trailing comma. +#define PASTE_LIST(x,y) PASTE2(x,y), + +// Pair token concatenation, transforming into a namespace and type. +#define NAMESPACE_LIST(NS,KLASS) NS::KLASS, + + +#define STRINGIZE_DETAIL(x) #x +#define STRINGIZE(x) STRINGIZE_DETAIL(x) +#define STRINGIZE_LIST(x) STRINGIZE(x), + + +#define STATIC_ASSERT(MSG) static_assert(false, MSG); + + +/////////////////////////////////////////////////////////////////////////////// + """) + + dst.write("#define MAX_VA_DISPATCH_ARGS %u\n" % num) + dst.write("#define MAX_VA_DISPATCH_ARITY %u\n" % arity) + + lines = itertools.chain ( + generate_dispatch(num), + generate_map(num, 0), + generate_map(num, 1), + generate_map(num, 2), + dispatch("MAP", num, 0), + dispatch("MAP", num, 1), + dispatch("MAP", num, 2), + generate_reduce(num), + dispatch("REDUCE", num, 1), + [ "#define PASTE(...) REDUCE1(PASTE2,__VA_ARGS__)" ], + generate_argcount(num) + ) + + for l in lines: + dst.write(l) + dst.write('\n') + + dst.writelines("#endif\n") diff --git a/test/preprocessor.cpp b/test/preprocessor.cpp new file mode 100644 index 00000000..2e4d815b --- /dev/null +++ b/test/preprocessor.cpp @@ -0,0 +1,21 @@ +#include "tap.hpp" +#include "preprocessor.hpp" + + +#define PLUS(X,Y) ((X)+(Y)) +#define SIX(...) 6 + +int +main (void) +{ + util::TAP::logger tap; + + int foo = 1, bar = 2, foobar = 3; + tap.expect_eq (foo + bar, PASTE(foo,bar), "PASTE"); + tap.expect_eq (REDUCE1(PLUS, 1, 2, 3, 4), 10, "REDUCE0"); + tap.expect_eq (MAP0(SIX, 9), 6, "MAP0"); + tap.expect_eq (MAP1(PLUS, 6, 9), 15, "MAP1"); + tap.expect_eq (VA_ARGS_COUNT (1, 2, 3, 4, 5, , 7, 8, 9), 9, "VA_ARGS_COUNT"); + + return tap.status (); +}