X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUtility.ct;h=bc771dccffcf158cf5b3407189005e608ed2c4a7;hb=7db21ff4de83edddec7084c5f121a10321b5a42f;hp=2f12892f51d2819bb736b8cfa15c94db39533f53;hpb=a30f975608bae2dcee151af15dc7f40602627615;p=senf.git

diff --git a/senf/Utils/Console/Utility.ct b/senf/Utils/Console/Utility.ct
index 2f12892..bc771dc 100644
--- a/senf/Utils/Console/Utility.ct
+++ b/senf/Utils/Console/Utility.ct
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -27,12 +27,49 @@
 
 // Custom includes
 #include <sstream>
+#include <limits>
 #include <boost/format.hpp>
+#include "Traits.hh"
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+// senf::console::ArgumentTraits< CharAsString<CharT> >
+
+template <class CharT>
+prefix_ void senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >::
+parse(ParseCommandInfo::TokensRange const & tokens, CharAsString<CharT> & out)
+{
+    std::string v;
+    console::parse(tokens,v);
+    if (v.size() != 1)
+        throw SyntaxErrorException("Invalid size of character constant");
+    out.value = static_cast<CharT>(v[0]);
+}
+
+template <class CharT>
+prefix_ std::string
+senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >::description()
+{
+    return std::numeric_limits<CharT>::is_signed ? "char" : "uchar";
+}
+
+template <class CharT>
+prefix_ std::string senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >::
+str(CharAsString<CharT> value)
+{
+    return console::str(std::string(1,value.value));
+}
+
+template <class CharT>
+prefix_ void senf::console::ReturnValueTraits< senf::console::CharAsString<CharT> >::
+format(CharAsString<CharT> value, std::ostream & os)
+{
+    console::format(std::string(1,value.value),os);
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ArgumentTraits< senf::console::ValueRange<T> >
 
 template <class T>
@@ -40,7 +77,7 @@ prefix_ void senf::console::ArgumentTraits< senf::console::ValueRange<T> >::
 parse(ParseCommandInfo::TokensRange const & tokens, type & out)
 {
     if (tokens.size() != 1)
-        throw senf::console::SyntaxErrorException("parameter syntax error");
+        throw SyntaxErrorException("parameter syntax error");
     std::string v (tokens.begin()[0].value());
     std::string::size_type i (v.find(':'));
     try {
@@ -52,7 +89,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, type & out)
         }
     }
     catch (std::bad_cast & ex) {
-        throw senf::console::SyntaxErrorException("parameter syntax error");
+        throw SyntaxErrorException("parameter syntax error");
     }
 }
 
@@ -72,7 +109,7 @@ str(type const & value)
     return ss.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ReturnValueTraits< senf::console::ValueRange<T> >
 
 template <class T>
@@ -84,7 +121,7 @@ format(type const & value, std::ostream & os)
         os << ':' << senf::console::str(value.high);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >
 
 template <class Enum>
@@ -95,7 +132,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, type & out)
     out.value = 0;
     while (arg) {
         Enum v;
-        senf::console::parse( *(arg++), v);
+        console::parse( *(arg++), v);
         out.value |= v;
     }
 }
@@ -112,11 +149,11 @@ prefix_ std::string
 senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >::str(type const & value)
 {
     std::stringstream ss;
-    senf::console::format(value, ss);
+    console::format(value, ss);
     return ss.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ReturnValueTraits< senf::console::FlagCollection<Enum> >
 
 template <class Enum>
@@ -129,13 +166,13 @@ format(type const & value, std::ostream & os)
     for (unsigned bit (0); bit<sizeof(value.value)*CHAR_BIT; ++bit, flag<<=1) {
         if (value.value & flag) {
             if (n++) ss << " ";
-            senf::console::format(static_cast<Enum>(flag), ss);
+            console::format(static_cast<Enum>(flag), ss);
         }
     }
     os << (n != 1 ? "(" + ss.str() + ")" : ss.str());
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_