prefix_ senf::console::DirectoryNode & senf::console::root()
{
- static DirectoryNode::ptr rootNode(new DirectoryNode(""));
+ static DirectoryNode::ptr rootNode(new DirectoryNode());
return *rootNode;
}
return path.empty() ? "/" : path;
}
+prefix_ bool senf::console::GenericNode::active()
+ const
+{
+ cptr node (thisptr());
+ while (node->parent())
+ node = node->parent();
+ return node == root().thisptr();
+}
+
///////////////////////////////////////////////////////////////////////////
//senf::console::DirectoryNode
-prefix_ void senf::console::DirectoryNode::add(GenericNode::ptr node, bool uniquify)
+prefix_ senf::console::GenericNode::ptr
+senf::console::DirectoryNode::remove(std::string const & name)
+{
+ ChildMap::iterator i (children_.find(name));
+ if (i == children_.end())
+ throw UnknownNodeNameException() << ": '" << name << "'";
+ GenericNode::ptr node (i->second);
+ children_.erase(i);
+ node->parent_ = 0;
+ node->name_.clear();
+ return node;
+}
+
+prefix_ void senf::console::DirectoryNode::add(GenericNode::ptr node)
{
BOOST_ASSERT( ! node->parent() );
+ if (node->name().empty()) {
+ node->name("unnamed");
+ SENF_LOG((senf::log::MESSAGE)("Adding 'unnamed' node"));
+ }
if (children_.find(node->name()) != children_.end()) {
- if (! uniquify)
- throw DuplicateNodeNameException() << ": '" << node->name() << "'";
unsigned suffix (0);
std::string newName;
do {
++suffix;
- newName = node->name() + boost::lexical_cast<std::string>(suffix);
+ newName = node->name() + "-" + boost::lexical_cast<std::string>(suffix);
} while (children_.find(newName) != children_.end());
- name(*node, newName);
+ SENF_LOG((senf::log::MESSAGE)("Uniquifying node '" << node->name() << "' to '"
+ << newName << "'"));
+ node->name(newName);
}
children_.insert(std::make_pair(node->name(),node));
node->parent_ = this;
}
prefix_ senf::console::GenericNode &
-senf::console::DirectoryNode::lookup(std::string const & name)
+senf::console::DirectoryNode::get(std::string const & name)
const
{
ChildMap::const_iterator i (children_.find(name));
return *(i->second);
}
+prefix_ void senf::console::DirectoryNode::v_help(std::ostream & output)
+ const
+{
+ output << doc_ << "\n";
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::SimpleCommandNode
+
+prefix_ void senf::console::SimpleCommandNode::v_help(std::ostream & output)
+ const
+{
+ output << doc_ << "\n";
+}
+
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "Node.mpp"