Changeset 724564 for src/Patterns/Factory_impl.hpp

Timestamp:

Jan 4, 2011, 5:15:14 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

1afcbe

Parents:

746ff1

git-author:

Frederik Heber <heber@…> (01/04/11 15:57:33)

git-committer:

Frederik Heber <heber@…> (01/04/11 17:15:14)

Message:

Factory know has an additional type table and stubs have been refactored.

• CommonStub.?pp contains basic classes with a int counter inside.
• Library version is now 2:1:0, API is 1.0.3.

File:

• src/Patterns/Factory_impl.hpp (modified) (5 diffs)

src/Patterns/Factory_impl.hpp

@@ -16 +16 @@
 #include <boost/preprocessor/punctuation/comma.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/punctuation/paren.hpp>
 #include <boost/preprocessor/seq/elem.hpp>
 #include <boost/preprocessor/seq/size.hpp>
@@ -52 +53 @@
 #endif
 
-/** Functions that allows to print a given seq of elements in the way of
- *  std::map from strings to enums.
- *
- * e.g. let "seq" be defined as
- * #define seq (one)(two)(three)(four)
- *
- * then we use
- * #define BOOST_PP_LOCAL_MACRO(n) seqitems_as_string_enum_map(seqsize, n, seq, EnumMap, name_space)
- * #define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(seq)-1 )
- * #include BOOST_PP_LOCAL_ITERATE()
- *
- * which expands by the preprocessor to:
- * EnumMap["one"] = test:: one;
- * EnumMap["two"] = test:: two;
- * EnumMap["three"] = test:: three;
- * EnumMap["four"] = test:: four;
-
- */
-#define seqitems_as_string_enum_map(z,n,seq_with_elements, map, name_space) \
-  map [BOOST_PP_STRINGIZE( \
-  BOOST_PP_SEQ_ELEM(n, seq_with_elements) \
-  )] = name_space BOOST_PP_SEQ_ELEM(n, seq_with_elements) \
-  ;
 
 /** Functions that allows to print a given seq of elements in the way of
@@ -92 +70 @@
  * EnumMap[three] = test::three;
  * EnumMap[four] = test::four;
-
+ *
  */
 #define seqitems_as_enum_key_map(z,n,seq_with_elements, map, keytype, name_space, suffix) \
@@ -99 +77 @@
   ] = keytype< name_space BOOST_PP_SEQ_ELEM(n, seq_with_elements) suffix > ();
 
+/** Functions that allows to print a given seq of elements in the way of
+ *  std::map from strings to enums.
+ *
+ * e.g. let "seq" be defined as
+ * #define seq (one)(two)(three)(four)
+ *
+ * then we use
+ * #define BOOST_PP_LOCAL_MACRO(n) seqitems_as_enum_value_map(seqsize, n, seq, EnumMap, typid BOOST_PP_LPAREN() super:: , BOOST_PP_RPAREN().name() , test::)
+ * #define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(seq)-1 )
+ * #include BOOST_PP_LOCAL_ITERATE()
+ *
+ * which expands by the preprocessor to:
+ * EnumMap[ typeid ( super:: one ) .name() ] = test::one;
+ * EnumMap[ typeid ( super:: two ) .name() ] = test::two;
+ * EnumMap[ typeid ( super:: three ) .name() ] = test::three;
+ * EnumMap[ typeid ( super:: four ) .name() ] = test::four;
+ *
+ * or we use
+ * #define BOOST_PP_LOCAL_MACRO(n) seqitems_as_enum_value_map(seqsize, n, seq, EnumMap, BOOST_PP_STRINGIZE BOOST_PP_LPAREN() , BOOST_PP_RPAREN() , test::)
+ * #define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(seq)-1 )
+ * #include BOOST_PP_LOCAL_ITERATE()
+ *
+ * which expands by the preprocessor to:
+ * EnumMap[ "one" ] = test:: one;
+ * EnumMap[ "two" ] = test:: two;
+ * EnumMap[ "three" ] = test:: three;
+ * EnumMap[ "four" ] = test:: four;
+ */
+#define seqitems_as_enum_value_map(z,n,seq_with_elements, map, type_specifier, type_suffix, enum_name_space) \
+  map [ type_specifier  \
+  BOOST_PP_SEQ_ELEM(n, seq_with_elements) \
+  type_suffix \
+  ] = enum_name_space BOOST_PP_SEQ_ELEM(n, seq_with_elements);
+
 
 template <>
@@ -104 +116 @@
 {
   // insert all known (enum, string) keys
-#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_string_enum_map(~, n, type_seq, enums, FactoryTypeList<Abstract_Interface_Class>::)
+#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_enum_value_map(~, n, type_seq, enums, BOOST_PP_STRINGIZE BOOST_PP_LPAREN() , BOOST_PP_RPAREN() , FactoryTypeList<Abstract_Interface_Class>::)
+#define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(type_seq)-1 )
+#include BOOST_PP_LOCAL_ITERATE()
+
+  // insert all known (type, enum) keys
+#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_enum_value_map(~, n, type_seq, types, typeid BOOST_PP_LPAREN() type_name_space , type_name_space_suffix BOOST_PP_RPAREN() .name(), FactoryTypeList<Abstract_Interface_Class>::)
 #define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(type_seq)-1 )
 #include BOOST_PP_LOCAL_ITERATE()