Changes in src/Actions/Action_impl_header.hpp [6ba9ba:3139b2]

File:

• src/Actions/Action_impl_header.hpp (modified) (11 diffs)

src/Actions/Action_impl_header.hpp

@@ -14 +14 @@
 #include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/comparison/not_equal.hpp>
-#include <boost/preprocessor/control/expr_if.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/debug/assert.hpp>
 #include <boost/preprocessor/iteration/local.hpp>
-#include <boost/preprocessor/list/adt.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/seq/elem.hpp>
@@ -34 +31 @@
 #include "Actions/ValueStorage.hpp"
 
-#include "Parameters/Parameter.hpp"
-
 // some derived names: if CATEGORY is not given, we don't prefix with it
 #ifdef CATEGORY
@@ -52 +47 @@
 #define MAXPARAMTYPES BOOST_PP_SEQ_SIZE(paramtypes)
 #endif
-#ifndef paramdefaults
-#define MAXPARAMDEFAULTS 0
-// this is required for valid_print "else part"
-#define sequencer(z,n,data) \
-  BOOST_PP_SEQ_PUSH_BACK( data, NOPARAM_DEFAULT)
-#define paramdefaults BOOST_PP_REPEAT( MAXPARAMTYPES, sequencer, BOOST_PP_SEQ_NIL )
-#else
-#define MAXPARAMDEFAULTS BOOST_PP_SEQ_SIZE(paramdefaults)
-#endif
-#define PARAM_DEFAULT(x) \
-    (x, BOOST_PP_NIL)
 
 // check user has given name and category
@@ -93 +77 @@
 #endif
 
-// check if paramdefaults is given, otherwise fill list with NOPARAM_DEFAULT
+// check if paramdefaults is given, otherwise fill list with NODEFAULT
 // this does not work: paramdefaults has to be completely defined before
 // being used within option_print (used as an array there and not as
 // some function call still to be expanded)
-//#define paramdefaults (NOPARAM_DEFAULT)
+//#define paramdefaults (NODEFAULT)
 //#define tempvalue(z,n,value)
-//  BOOST_PP_CAT(value,(NOPARAM_DEFAULT))
+//  BOOST_PP_CAT(value,(NODEFAULT))
 //BOOST_PP_REPEAT(tempvalue, MAXPARAMTYPES, paramdefaults)
 //#undef tempvalue
@@ -111 +95 @@
 #endif
 
-// print a list of type ref followed by a separator, i.e. "Parameter<int> i;"
+// print a list of type ref followed by a separator, i.e. "int i;"
 #define type_print(z,n,TYPELIST, VARLIST, separator) \
-  Parameter < \
   BOOST_PP_SEQ_ELEM(n, TYPELIST) \
-  > \
-  BOOST_PP_SEQ_ELEM(n, VARLIST) \
+  BOOST_PP_SEQ_ELEM(n, VARLIST)\
   separator
 
@@ -126 +108 @@
 
 // prints Options.insert
+#ifdef paramdefaults
 #define option_print(z,n,unused, unused2) \
   tester = Options. insert (\
@@ -133 +116 @@
           BOOST_PP_SEQ_ELEM(n, paramtokens), \
           &typeid( BOOST_PP_SEQ_ELEM(n, paramtypes) ), \
-          BOOST_PP_SEQ_ELEM(n, paramdescriptions) \
-          BOOST_PP_COMMA_IF( BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) ) ) \
-          BOOST_PP_EXPR_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, paramdefaults) )) \
-              BOOST_PP_RPAREN() \
-          )\
+          BOOST_PP_SEQ_ELEM(n, paramdescriptions), \
+          std::string( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) )\
       )\
   ); \
   ASSERT(tester.second, "ActionTrait<ACTION>::ActionTrait<ACTION>() option token present twice!");
+#else
+#define option_print(z,n,unused, unused2) \
+  tester = Options. insert (\
+      std::pair< std::string, OptionTrait *> ( \
+      BOOST_PP_SEQ_ELEM(n, paramtokens), \
+      new OptionTrait(\
+          BOOST_PP_SEQ_ELEM(n, paramtokens), \
+          &typeid( BOOST_PP_SEQ_ELEM(n, paramtypes) ), \
+          BOOST_PP_SEQ_ELEM(n, paramdescriptions), \
+          NODEFAULT )\
+      )\
+  ); \
+  ASSERT(tester.second, "ActionTrait<ACTION>::ActionTrait<ACTION>() option token present twice!");
+#endif
 
 namespace MoleCuilder {
@@ -214 +205 @@
 
   struct PARAMS : ActionParameters {
-    //!> constructor for class PARAMS, setting valid ranges
-    PARAMS();
-    //!> copy constructor for class PARAMS, setting valid ranges
-    PARAMS(const PARAMS &p);
   #if defined paramtypes && defined paramreferences
   #define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, paramtypes, paramreferences, ;)
@@ -232 +219 @@
 
 private:
-  //virtual void getParametersfromValueStorage();
+  virtual void getParametersfromValueStorage();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);
@@ -240 +227 @@
 }
 
-#undef paramvalids
 #undef paramtypes
 #undef paramtokens
@@ -247 +233 @@
 #undef paramdefaults
 #undef MAXPARAMTYPES
-#undef MAXPARAMDEFAULTS
 #undef statetypes
 #undef statereferences
 #undef MAXSTATETYPES
-#undef PARAM_DEFAULT
 
 #undef option_print
-#undef sequencer
 #undef type_print
 #undef type_list