X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.cci;h=a38a11f90ade259cc8cb73ea88c6409a85665333;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=f1935b39801ed6326acb6ac4b96115dbc8ab626b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Console/Node.cci b/senf/Utils/Console/Node.cci index f1935b3..a38a11f 100644 --- a/senf/Utils/Console/Node.cci +++ b/senf/Utils/Console/Node.cci @@ -1,24 +1,29 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // 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. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// 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. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// 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. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Node inline non-template implementation */ @@ -26,12 +31,11 @@ #include "Node.ih" // Custom includes -#include "../../Utils/senfassert.hh" #define prefix_ inline -///////////////////////////////cci.p/////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::GenericNode prefix_ senf::console::GenericNode::ptr senf::console::GenericNode::thisptr() @@ -135,7 +139,7 @@ prefix_ senf::console::GenericNode & senf::console::GenericNode::followLink() : *this; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::LinkNode prefix_ senf::console::GenericNode & senf::console::LinkNode::follow() @@ -156,7 +160,7 @@ prefix_ senf::console::LinkNode::LinkNode(GenericNode & node) : node_ (node.thisptr()) {} -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::DirectoryNode prefix_ senf::console::DirectoryNode::ptr senf::console::DirectoryNode::create() @@ -212,18 +216,6 @@ senf::console::DirectoryNode::operator()(std::string const & name) return getCommand(name); } -prefix_ senf::console::DirectoryNode & -senf::console::DirectoryNode::mkdir(std::string const & name) -{ - return add(name, create()); -} - -prefix_ senf::console::DirectoryNode & -senf::console::DirectoryNode::provideDirectory(std::string const & name) -{ - return hasChild(name) ? getDirectory(name) : mkdir(name); -} - prefix_ senf::console::DirectoryNode::ChildrenRange senf::console::DirectoryNode::children() const { @@ -238,11 +230,6 @@ senf::console::DirectoryNode::completions(std::string const & s) children_.lower_bound(s + "\xff")); } -prefix_ void senf::console::DirectoryNode::link(std::string const & name, GenericNode & target) -{ - add(name, LinkNode::create(target)); -} - prefix_ senf::console::DirectoryNode::DirectoryNode() {} @@ -271,7 +258,7 @@ prefix_ senf::console::DirectoryNode::cptr senf::console::DirectoryNode::thisptr return boost::static_pointer_cast(shared_from_this()); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::NodeTraverser #ifndef DOXYGEN @@ -280,9 +267,10 @@ prefix_ senf::console::detail::NodeTraverser::NodeTraverser(DirectoryNode & root bool autocomplete) : root_ (root), dir_ (dir.thisptr()), autocomplete_ (autocomplete), init_ (false) {} + #endif -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::CommandNode prefix_ senf::console::CommandNode::ptr senf::console::CommandNode::thisptr() @@ -329,7 +317,7 @@ prefix_ void senf::console::CommandNode::operator()(boost::any & rv, std::ostrea execute(rv, output, command); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::SimpleCommandNode prefix_ senf::console::SimpleCommandNode::SimpleCommandNode(Function const & fn) @@ -367,25 +355,90 @@ prefix_ senf::console::SimpleCommandNode::cptr senf::console::SimpleCommandNode: return boost::static_pointer_cast(shared_from_this()); } -#ifndef DOXYGEN +//-///////////////////////////////////////////////////////////////////////////////////////////////// + +prefix_ senf::console::DirectoryNode & senf::console::provideDirectory(DirectoryNode & dir, + std::string const & name) +{ + return dir.hasChild(name) ? dir.getDirectory(name) : dir.add(name, factory::Directory()); +} + + +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// senf::console::factory::SimpleCommand + +prefix_ senf::console::factory::SimpleCommand::SimpleCommand(SimpleCommandNode::Function fn) + : node_ (SimpleCommandNode::create(fn)) +{} prefix_ senf::console::SimpleCommandNode & -senf::console::senf_console_add_node(DirectoryNode & node, std::string const & name, - SimpleCommandNode::Function fn, int) +senf::console::factory::SimpleCommand::create(DirectoryNode & dir, std::string const & name) + const { - return node.add(name, SimpleCommandNode::create(fn)); + return dir.add(name, node_); } +prefix_ senf::console::factory::SimpleCommand const & +senf::console::factory::SimpleCommand::doc(std::string const & doc) + const +{ + node_->doc(doc); + return *this; +} + +prefix_ senf::console::factory::SimpleCommand const & +senf::console::factory::SimpleCommand::shortdoc(std::string const & doc) + const +{ + node_->shortdoc(doc); + return *this; +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// senf::console::factory::Directory + +prefix_ senf::console::factory::Directory::Directory() + : node_ (DirectoryNode::create()) +{} + prefix_ senf::console::DirectoryNode & -senf::console::senf_console_add_node(DirectoryNode & node, std::string const & name, - DirectoryNode & dir, int) +senf::console::factory::Directory::create(DirectoryNode & dir, std::string const & name) + const { - return node.add(name, dir.thisptr()); + return dir.add(name, node_); } -#endif +prefix_ senf::console::factory::Directory const & +senf::console::factory::Directory::doc(std::string const & doc) + const +{ + node_->doc(doc); + return *this; +} + +prefix_ senf::console::factory::Directory const & +senf::console::factory::Directory::shortdoc(std::string const & doc) + const +{ + node_->shortdoc(doc); + return *this; +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// senf::console::factory::Link + +prefix_ senf::console::factory::Link::Link(GenericNode & target) + : node_ (LinkNode::create(target)) +{} + +prefix_ senf::console::LinkNode & senf::console::factory::Link::create(DirectoryNode & dir, + std::string const & name) + const +{ + return dir.add(name, node_); +} -///////////////////////////////cci.e/////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_