From: g0dil Date: Thu, 9 Jul 2009 09:37:20 +0000 (+0000) Subject: Utils/Console: Add ValueRange utility X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=1e7062482bb6d99a0c36b641069c73a4a93da9cc;p=senf.git Utils/Console: Add ValueRange utility git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1261 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Utils/Console/Console.hh b/Utils/Console/Console.hh index 6b1b6ae..3edb38c 100644 --- a/Utils/Console/Console.hh +++ b/Utils/Console/Console.hh @@ -42,6 +42,7 @@ #include "Sysdir.hh" #include "STLSupport.hh" #include "UDPServer.hh" +#include "Utility.hh" ///////////////////////////////hh.e//////////////////////////////////////// //#include "Console.cci" diff --git a/Utils/Console/Utility.ct b/Utils/Console/Utility.ct new file mode 100644 index 0000000..14b5094 --- /dev/null +++ b/Utils/Console/Utility.ct @@ -0,0 +1,93 @@ +// $Id$ +// +// Copyright (C) 2009 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +/** \file + \brief Utility non-inline template implementation */ + +//#include "Utility.ih" + +// Custom includes +#include +#include + +#define prefix_ +///////////////////////////////ct.p//////////////////////////////////////// + +template +prefix_ void senf::console::ArgumentTraits< senf::console::ValueRange >:: +parse(ParseCommandInfo::TokensRange const & tokens, type & out) +{ + if (tokens.size() != 1) + throw senf::console::SyntaxErrorException("parameter syntax error"); + std::string v (tokens.begin()[0].value()); + unsigned i (v.find(':')); + try { + if (i == std::string::npos) + out.low = out.high = boost::lexical_cast(v); + else { + out.low = boost::lexical_cast(v.substr(0,i)); + out.high = boost::lexical_cast(v.substr(i+1)); + } + } + catch (std::bad_cast & ex) { + throw senf::console::SyntaxErrorException("parameter syntax error"); + } +} + +template +prefix_ std::string senf::console::ArgumentTraits< senf::console::ValueRange >:: +description() +{ + return (boost::format("range<%s>") % ArgumentTraits::description()).str(); +} + +template +prefix_ std::string senf::console::ArgumentTraits< senf::console::ValueRange >:: +str(type const & value) +{ + std::stringstream ss; + senf::console::format(value, ss); + return ss.str(); +} + +template +prefix_ void senf::console::ReturnValueTraits< senf::console::ValueRange >:: +format(type const & value, std::ostream & os) +{ + os << value.low; + if (value.low != value.high) + os << ':' << value.high; +} + +///////////////////////////////ct.e//////////////////////////////////////// +#undef prefix_ + + +// Local Variables: +// mode: c++ +// fill-column: 100 +// comment-column: 40 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// End: diff --git a/Utils/Console/Utility.hh b/Utils/Console/Utility.hh new file mode 100644 index 0000000..beb8982 --- /dev/null +++ b/Utils/Console/Utility.hh @@ -0,0 +1,91 @@ +// $Id$ +// +// Copyright (C) 2009 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +/** \file + \brief Utility public header */ + +#ifndef HH_SENF_Utils_Console_Utility_ +#define HH_SENF_Utils_Console_Utility_ 1 + +// Custom includes +#include "Parse.hh" +#include "Traits.hh" + +//#include "Utility.mpp" +///////////////////////////////hh.p//////////////////////////////////////// + +namespace senf { +namespace console { + + /** \brief Value range + + A value range may be represented in the console either by a single value (setting both \a + low and \a high to the same value) or as a lower and upper bound seperated by a colon + */ + template + struct ValueRange + { + T low; + T high; + }; + +#ifndef DOXYGEN + + template + struct ArgumentTraits< ValueRange > + { + typedef ValueRange type; + static bool const singleToken = true; + + static void parse(ParseCommandInfo::TokensRange const & tokens, type & out); + static std::string description(); + static std::string str(type const & value); + }; + + template + struct ReturnValueTraits< ValueRange > + { + typedef ValueRange type; + + static void format(type const & value, std::ostream & os); + }; + +#endif + +}} + +///////////////////////////////hh.e//////////////////////////////////////// +//#include "Utility.cci" +#include "Utility.ct" +//#include "Utility.cti" +#endif + + +// Local Variables: +// mode: c++ +// fill-column: 100 +// comment-column: 40 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// End: