// $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>
// Custom includes
#include <string>
+#include <limits>
#include <boost/preprocessor/seq/for_each.hpp>
#include <boost/preprocessor/stringize.hpp>
#include <boost/preprocessor/facilities/empty.hpp>
#include <boost/bimap.hpp>
#include <boost/assign/list_inserter.hpp>
#include <boost/algorithm/string/case_conv.hpp>
-#include <senf/Utils/singleton.hh>
+#include <boost/mpl/if.hpp>
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
namespace senf {
namespace console {
+
+ template <class _> struct ArgumentTraits;
+ 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>
+ {};
+
+ template <class CharT>
+ struct CharArgumentTraits
+ : public ArgumentTraits<typename MatchingShortType<CharT>::type>
+ {
+ typedef ArgumentTraits<typename MatchingShortType<CharT>::type> base;
+ typedef CharT type;
+ static void parse(ParseCommandInfo::TokensRange const & tokens, CharT & out);
+ static std::string description();
+ };
+
+ template <class CharT>
+ struct CharReturnValueTraits
+ : public ReturnValueTraits<typename MatchingShortType<CharT>::type>
+ {
+ typedef CharT type;
+ };
+
#ifndef DOXYGEN
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); }
};
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) \
}}}
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#endif
\f