X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.ih;h=faac9a316adcdbbd1cb62628f792963d39255a37;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=c3d612718de2ea5237e6b3e573cafe569d33694f;hpb=a30f975608bae2dcee151af15dc7f40602627615;p=senf.git

diff --git a/senf/Utils/Console/Traits.ih b/senf/Utils/Console/Traits.ih
index c3d6127..faac9a3 100644
--- a/senf/Utils/Console/Traits.ih
+++ b/senf/Utils/Console/Traits.ih
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -36,9 +36,8 @@
 #include <boost/assign/list_inserter.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/mpl/if.hpp>
-#include <senf/Utils/singleton.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -47,7 +46,7 @@ namespace console {
     template <class _> struct ReturnValueTraits;
 
 namespace detail {
-    
+
     template <class CharT>
     struct MatchingShortType
         : public boost::mpl::if_c<std::numeric_limits<CharT>::is_signed,short,unsigned short>
@@ -74,7 +73,7 @@ namespace detail {
     struct StringILess
     {
         bool operator()(std::string const & left, std::string const & right) const
-            { return boost::algorithm::to_lower_copy(left) 
+            { return boost::algorithm::to_lower_copy(left)
                   < boost::algorithm::to_lower_copy(right); }
     };
 
@@ -83,8 +82,29 @@ namespace detail {
     long parseEnum(EnumTable const & table, ParseCommandInfo::TokensRange const & tokens);
     std::string formatEnum(EnumTable const & table, long value);
 
-#   define SENF_CONSOLE_REGISTER_ENUM_ELT(r,d,e) \
-        ( BOOST_PP_STRINGIZE(e), static_cast<long>(d e) )
+#   define SENF_CONSOLE_REGISTER_ENUM_ELT(r,d,e)                        \
+        BOOST_PP_IF( SENF_CONSOLE_REGISTER_ENUM_HASKEY(e),              \
+                     SENF_CONSOLE_REGISTER_ENUM_WITHKEY,                \
+                     SENF_CONSOLE_REGISTER_ENUM_NOKEY )(d, e)
+
+#   define SENF_CONSOLE_REGISTER_ENUM_GOBBLE__key(k,e)
+#   define SENF_CONSOLE_REGISTER_ENUM_GET_KEY__key(k,e) k
+#   define SENF_CONSOLE_REGISTER_ENUM_GET_ENUM__key(k,e) e
+#   define SENF_CONSOLE_REGISTER_ENUM_HASKEY(e)                         \
+        BOOST_PP_IS_EMPTY( SENF_CAT_RECURS1(SENF_CONSOLE_REGISTER_ENUM_GOBBLE__, e) )
+
+#   define SENF_CONSOLE_REGISTER_ENUM_KEY_GETENUM(e)                    \
+        SENF_CAT_RECURS2(SENF_CONSOLE_REGISTER_ENUM_GET_ENUM__, e)
+#   define SENF_CONSOLE_REGISTER_ENUM_KEY_GETKEY(e)                     \
+        SENF_CAT_RECURS3(SENF_CONSOLE_REGISTER_ENUM_GET_KEY__, e)
+
+#   define SENF_CONSOLE_REGISTER_ENUM_NOKEY(prefix, e)                  \
+        ( BOOST_PP_STRINGIZE(e), static_cast<long>(prefix e) )
+
+#   define SENF_CONSOLE_REGISTER_ENUM_WITHKEY(prefix, e)                \
+        ( SENF_CONSOLE_REGISTER_ENUM_KEY_GETKEY(e),                     \
+          static_cast<long>(prefix SENF_CONSOLE_REGISTER_ENUM_KEY_GETENUM(e)) )
+
 
 #   define SENF_CONSOLE_REGISTER_ENUM_(Prefix, Type, Values)                                      \
         inline senf::console::detail::EnumTable & senf_console_enum_table(Prefix Type)            \
@@ -112,7 +132,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif