X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FNode.cci;h=c5adaf3b231325a7ab23f6044b8c8fb532909972;hb=d2459b6c8249291588fd3d0d125ed3d38e003b55;hp=915d954fe26353228015121ef0606cc98d0bcaa4;hpb=9c0078ac0054789badff2a987364ed0448b080ef;p=senf.git

diff --git a/Console/Node.cci b/Console/Node.cci
index 915d954..c5adaf3 100644
--- a/Console/Node.cci
+++ b/Console/Node.cci
@@ -52,11 +52,6 @@ prefix_ void senf::console::GenericNode::name(std::string const & name)
     name_ = name;
 }
 
-prefix_ void senf::console::GenericNode::name(GenericNode & node, std::string const & name)
-{
-    node.name_ = name;
-}
-
 prefix_ boost::shared_ptr<senf::console::DirectoryNode> senf::console::GenericNode::parent()
     const
 {
@@ -66,8 +61,10 @@ prefix_ boost::shared_ptr<senf::console::DirectoryNode> senf::console::GenericNo
 
 prefix_ senf::console::GenericNode::ptr senf::console::GenericNode::unlink()
 {
-    SENF_ASSERT( parent() );
-    return parent()->remove(name());
+    if (parent_)
+        return parent()->remove(name());
+    else
+        return thisptr();
 }
 
 prefix_ void senf::console::GenericNode::help(std::ostream & output)
@@ -90,31 +87,35 @@ prefix_ senf::console::GenericNode::cptr senf::console::GenericNode::thisptr()
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::DirectoryNode
 
-prefix_ std::auto_ptr<senf::console::DirectoryNode>
-senf::console::DirectoryNode::create()
+prefix_ senf::console::DirectoryNode::ptr senf::console::DirectoryNode::create()
 {
-    return std::auto_ptr<DirectoryNode>(new DirectoryNode());
+    return ptr(new DirectoryNode());
 }
 
 prefix_ senf::console::DirectoryNode &
 senf::console::DirectoryNode::operator[](std::string const & name)
     const
 {
-    return dynamic_cast<DirectoryNode&>(get(name));
+    try {
+        return dynamic_cast<DirectoryNode&>(get(name));
+    }
+    SENF_WRAP_EXC(std::bad_cast)
 }
 
 prefix_ senf::console::CommandNode &
 senf::console::DirectoryNode::operator()(std::string const & name)
     const
 {
-    return dynamic_cast<CommandNode&>(get(name));
+    try {
+        return dynamic_cast<CommandNode&>(get(name));
+    }
+    SENF_WRAP_EXC(std::bad_cast)
 }
 
 prefix_ senf::console::DirectoryNode &
 senf::console::DirectoryNode::mkdir(std::string const & name)
 {
-    std::auto_ptr<DirectoryNode> node (create());
-    return add(name, node);
+    return add(name, create());
 }
 
 prefix_ senf::console::DirectoryNode::ChildrenRange senf::console::DirectoryNode::children()
@@ -145,6 +146,13 @@ prefix_ senf::console::DirectoryNode::cptr senf::console::DirectoryNode::thisptr
 }
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::console::SyntaxErrorException
+
+prefix_ senf::console::SyntaxErrorException::SyntaxErrorException(std::string const & msg)
+    : Exception(msg)
+{}
+
+///////////////////////////////////////////////////////////////////////////
 // senf::console::CommandNode
 
 prefix_ senf::console::CommandNode::ptr senf::console::CommandNode::thisptr()
@@ -161,23 +169,24 @@ prefix_ senf::console::CommandNode::cptr senf::console::CommandNode::thisptr()
 prefix_ senf::console::CommandNode::CommandNode()
 {}
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::SimpleCommandNode
-
-prefix_ void senf::console::SimpleCommandNode::operator()(std::ostream & output,
-                                                          Arguments const & arguments)
+prefix_ void senf::console::CommandNode::operator()(std::ostream & output,
+                                                    Arguments const & arguments)
+    const
 {
-    fn_(output, arguments);
+    v_execute(output, arguments);
 }
 
+///////////////////////////////////////////////////////////////////////////
+// senf::console::SimpleCommandNode
+
 prefix_ senf::console::SimpleCommandNode::SimpleCommandNode(Function const & fn)
     : fn_ (fn)
 {}
 
-prefix_ std::auto_ptr<senf::console::SimpleCommandNode>
+prefix_ senf::console::SimpleCommandNode::ptr
 senf::console::SimpleCommandNode::create(Function const & fn)
 {
-    return std::auto_ptr<SimpleCommandNode>(new SimpleCommandNode(fn));
+    return ptr(new SimpleCommandNode(fn));
 }
 
 prefix_ senf::console::SimpleCommandNode &
@@ -187,6 +196,17 @@ senf::console::SimpleCommandNode::doc(std::string const & doc)
     return *this;
 }
 
+prefix_ senf::console::SimpleCommandNode::ptr senf::console::SimpleCommandNode::thisptr()
+{
+    return boost::static_pointer_cast<SimpleCommandNode>(shared_from_this());
+}
+
+prefix_ senf::console::SimpleCommandNode::cptr senf::console::SimpleCommandNode::thisptr()
+    const
+{
+    return boost::static_pointer_cast<SimpleCommandNode const>(shared_from_this());
+}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_