Changes in src/Actions/Action_impl_python.hpp [d628da:6ba9ba]

File:

• src/Actions/Action_impl_python.hpp (modified) (4 diffs)

src/Actions/Action_impl_python.hpp

@@ -18 +18 @@
 #include <boost/preprocessor/facilities/expand.hpp>
 #include <boost/preprocessor/iteration/local.hpp>
+#include <boost/preprocessor/list/adt.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
-
-#define NODEFAULT ""
+#include <boost/preprocessor/punctuation/paren.hpp>
 
 // some derived names: if CATEGORY is not given, we don't prefix with it
@@ -32 +32 @@
 #define PARAMS BOOST_PP_CAT(ACTIONNAME, Parameters)
 #endif
+
+// for paramdefaults entries
+#define PARAM_DEFAULT(x) \
+    (x, BOOST_PP_NIL)
 
 // check if no lists given
@@ -61 +65 @@
   BOOST_PP_SEQ_ELEM(n, STRINGLIST) \
   ) \
-  = BOOST_PP_SEQ_ELEM(n, DEFAULTLIST)
+  = \
+  BOOST_PP_IF( \
+      BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) ), \
+      toString BOOST_PP_LPAREN() \
+          BOOST_PP_LIST_FIRST( BOOST_PP_SEQ_ELEM(n, DEFAULTLIST) ) \
+      BOOST_PP_RPAREN(), \
+      std::string("") \
+  )
 
 // print a list of comma-separated list, i.e. (,)arg("Action")
@@ -142 +153 @@
 #undef PARAMS
 #undef MAXPARAMTYPES
+#undef PARAM_DEFAULT
 
 #undef help_print