X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FOverloadedCommand.cc;h=d9363a39656ed1c66d73ecd41b9f272b131ee147;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=c9e75298a2bb4c5e204c6ef5d01f84b536e2e7e1;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Console/OverloadedCommand.cc b/senf/Utils/Console/OverloadedCommand.cc index c9e7529..d9363a3 100644 --- a/senf/Utils/Console/OverloadedCommand.cc +++ b/senf/Utils/Console/OverloadedCommand.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 @@ -30,12 +30,25 @@ //#include "OverloadedCommand.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::OverloadedCommandNode -/////////////////////////////////////////////////////////////////////////// +prefix_ senf::console::OverloadedCommandNode & +senf::console::OverloadedCommandNode::insertOverload(DirectoryNode & dir, + std::string const & name, + CommandOverload::ptr overload) +{ + OverloadedCommandNode & node ( + dir.hasChild(name) + ? dynamic_cast(dir(name)) + : dir.add(name, OverloadedCommandNode::create())); + node.add(overload); + return node; +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// // So soll die doku aussehen: // // Usage: @@ -49,14 +62,14 @@ // default: 1.23 // arg3 - arg3-doc // -// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj +// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj // sdflkja sldkfjslkdfj sdlkfj lskjdf lskjdf lksj dflkj lsdkfj lskdjf lskjkd -// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj +// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj // sdflkja sldkfjslkdfj sdlkfj lskjdf lskjdf lksj dflkj lsdkfj lskdjf lskjkd -// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj +// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj // sdflkja sldkfjslkdfj sdlkfj lskjdf lskjdf lksj dflkj lsdkfj lskdjf lskjkd // -// Variant 1: +// Variant 1: // Variant 1 doc la;ksjf lkj sdlkfj lkjekj sdflkj ekljsdlkfj wlej // slkj dkj sldkfj lwekljsdf skldjf lskjdf l jsd // @@ -65,7 +78,7 @@ // // Variatn 3: // Variant 3 doc slkjflw ekj lskdfj lskdjf laksdj flksj elkj aldskjf lwkejlksdj -// ldkfaj wlekj slkdfj lskdjf lwkejlkasdjf +// ldkfaj wlekj slkdfj lskdjf lwkejlkasdjf prefix_ void senf::console::OverloadedCommandNode::v_help(std::ostream & os) const @@ -124,8 +137,8 @@ prefix_ void senf::console::OverloadedCommandNode::v_help(std::ostream & os) ArgumentDocs::const_iterator const i_end (argumentDocs.end()); for (; i != i_end; ++i) { if (! i->doc.empty() || ! i->defaultValue.empty()) { - os << " " - << i->name + os << " " + << i->name << std::string(i->name.length()<8 ? 8-i->name.length() : 0, ' ') << " " << i->doc @@ -135,10 +148,10 @@ prefix_ void senf::console::OverloadedCommandNode::v_help(std::ostream & os) } } } - + if (! doc_.empty()) os << "\n" << doc_ << "\n"; - + { Overloads::const_iterator i (overloads_.begin()); Overloads::const_iterator const i_end (overloads_.end()); @@ -166,7 +179,7 @@ prefix_ std::string senf::console::OverloadedCommandNode::v_shorthelp() Overloads::const_iterator const i_end (overloads_.end()); for (; i != i_end; ++i) { std::string overloadDoc ((*i)->doc()); - if (! overloadDoc.empty()) + if (! overloadDoc.empty()) return overloadDoc.substr(0,overloadDoc.find('\n')); } return ""; @@ -192,7 +205,7 @@ prefix_ void senf::console::OverloadedCommandNode::v_execute(boost::any & rv, throw err; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::SimpleCommandOverload prefix_ unsigned senf::console::SimpleCommandOverload::v_numArguments() @@ -219,7 +232,7 @@ prefix_ void senf::console::SimpleCommandOverload::v_execute(boost::any & rv, fn_(os, command); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "OverloadedCommand.mpp"