X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.cc;h=f704097a632f2b6abe22c3deefb44e62d4438862;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=f85d6f56883f8491fa265fae2db530fd0126a628;hpb=1d058092bd771d52996416763b5d9cafadc2e087;p=senf.git diff --git a/senf/Utils/Console/Traits.cc b/senf/Utils/Console/Traits.cc index f85d6f5..f704097 100644 --- a/senf/Utils/Console/Traits.cc +++ b/senf/Utils/Console/Traits.cc @@ -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 @@ -31,22 +31,7 @@ //#include "Traits.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// - -prefix_ std::string senf::console::ArgumentTraits::str(std::string const & value) -{ - if (! value.empty() && boost::algorithm::all(value, CommandParser::isWordChar)) - return value; - else { - std::string rv (value); - for (std::string::size_type i (0); i < rv.size(); ++i) - if (rv[i] == '"' || rv[i] == '\\') - rv.insert(i++,"\\"); - rv.insert(0,"\""); - rv.push_back('"'); - return rv; - } -} +//-///////////////////////////////////////////////////////////////////////////////////////////////// prefix_ long senf::console::detail::parseEnum(EnumTable const & table, ParseCommandInfo::TokensRange const & tokens) @@ -74,11 +59,11 @@ prefix_ long senf::console::detail::parseEnum(EnumTable const & table, prefix_ std::string senf::console::detail::formatEnum(EnumTable const & table, long value) { EnumTable::right_map::const_iterator i (table.right.find(value)); - SENF_ASSERT( i != table.right.end() ); + SENF_ASSERT( i != table.right.end(), "Invalid enum value" ); return i->second; } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "Traits.mpp"