Scheduler: Implement Timer helper

[senf.git] / Console / Server.cci

diff --git a/Console/Server.cci b/Console/Server.cci
index 573773d..405347c 100644 (file)
--- a/Console/Server.cci
+++ b/Console/Server.cci
@@ -46,111 +46,157 @@ prefix_ senf::console::Client & senf::console::detail::NonblockingSocketSink::cl
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::Server
 
-prefix_ void senf::console::Server::name(std::string const & name)
+prefix_ senf::console::Server & senf::console::Server::name(std::string const & name)
 {
     name_ = name;
+    return *this;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::detail::ClientReader
+prefix_ std::string const & senf::console::Server::name()
+    const
+{
+    return name_;
+}
 
-prefix_ senf::console::detail::ClientReader::~ClientReader()
-{}
+prefix_ senf::console::Server & senf::console::Server::root(DirectoryNode & root)
+{
+    root_ = root.thisptr();
+    return *this;
+}
 
-prefix_ senf::console::Client & senf::console::detail::ClientReader::client()
-    const
+prefix_ senf::console::Server & senf::console::Server::mode(Mode m)
 {
-    return client_;
+    mode_ = m;
+    return *this;
 }
 
-prefix_ std::string senf::console::detail::ClientReader::promptString()
+prefix_ senf::console::Server::Mode senf::console::Server::mode()
     const
 {
-    return client().promptString();
+    return mode_;
 }
 
-prefix_ senf::console::detail::ClientReader::ClientHandle senf::console::detail::ClientReader::handle()
-    const
+prefix_ void senf::console::Server::stop()
 {
-    return client().handle();
+    // commit suicide
+    instancePtr().reset(0);
 }
 
-prefix_ std::ostream & senf::console::detail::ClientReader::stream()
+///////////////////////////////////////////////////////////////////////////
+// senf::console::Client
+
+prefix_ senf::console::Client::~Client()
+{
+    stream() << std::flush;
+}
+
+prefix_ void senf::console::Client::stop()
+{
+    // THIS COMMITS SUICIDE. THE INSTANCE IS GONE AFTER removeClient RETURNS
+    server_.removeClient(*this);
+}
+
+prefix_ std::string const & senf::console::Client::name()
     const
 {
-    return client().stream();
+    return name_;
 }
 
-prefix_ void senf::console::detail::ClientReader::stopClient()
+prefix_ std::string senf::console::Client::promptString()
+    const
 {
-    client().stop();
+    return name_ + ":" + executor_.cwdPath() + "$ ";
 }
 
-prefix_ void senf::console::detail::ClientReader::handleInput(std::string const & input)
+prefix_ senf::console::DirectoryNode & senf::console::Client::root()
     const
 {
-    client().handleInput(input);
+    return server_.root();
 }
 
-prefix_ void senf::console::detail::ClientReader::disablePrompt()
+prefix_ senf::console::Server::Mode senf::console::Client::mode()
+    const
 {
-    v_disablePrompt();
+    return mode_;
 }
 
-prefix_ void senf::console::detail::ClientReader::enablePrompt()
+prefix_ senf::console::Client & senf::console::Client::get(std::ostream & os)
 {
-    v_enablePrompt();
+    return dynamic_cast<detail::NonblockingSocketOStream&>(os)->client();
 }
 
-prefix_ void senf::console::detail::ClientReader::translate(std::string & data)
+prefix_ senf::console::Client::ClientHandle senf::console::Client::handle()
+    const
 {
-    v_translate(data);
+    return handle_;
 }
 
-prefix_ senf::console::detail::ClientReader::ClientReader(Client & client)
-    : client_ (client)
-{}
+prefix_ std::ostream & senf::console::Client::stream()
+{
+    return out_t::member;
+}
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::console::Client
+// senf::console::detail::ClientReader
 
-prefix_ senf::console::Client::~Client()
+prefix_ senf::console::detail::ClientReader::~ClientReader()
 {}
 
-prefix_ void senf::console::Client::stop()
+prefix_ senf::console::Client & senf::console::detail::ClientReader::client()
+    const
 {
-    // THIS COMMITS SUICIDE. THE INSTANCE IS GONE AFTER removeClient RETURNS
-    server_.removeClient(*this);
+    return client_;
 }
 
-prefix_ std::string const & senf::console::Client::name()
+prefix_ std::string senf::console::detail::ClientReader::promptString()
     const
 {
-    return name_;
+    return client().promptString();
 }
 
-prefix_ std::string senf::console::Client::promptString()
+prefix_ senf::console::detail::ClientReader::ClientHandle senf::console::detail::ClientReader::handle()
     const
 {
-    return name_ + ":" + executor_.cwd().path() + "$ ";
+    return client().handle();
 }
 
-prefix_ senf::console::Client & senf::console::Client::get(std::ostream & os)
+prefix_ std::ostream & senf::console::detail::ClientReader::stream()
+    const
 {
-    return dynamic_cast<detail::NonblockingSocketOStream&>(os)->client();
+    return client().stream();
 }
 
-prefix_ senf::console::Client::ClientHandle senf::console::Client::handle()
+prefix_ void senf::console::detail::ClientReader::stopClient()
+{
+    client().stop();
+}
+
+prefix_ std::string::size_type
+senf::console::detail::ClientReader::handleInput(std::string const & input, bool incremental)
     const
 {
-    return handle_;
+    return client().handleInput(input, incremental);
 }
 
-prefix_ std::ostream & senf::console::Client::stream()
+prefix_ void senf::console::detail::ClientReader::disablePrompt()
 {
-    return out_t::member;
+    v_disablePrompt();
+}
+
+prefix_ void senf::console::detail::ClientReader::enablePrompt()
+{
+    v_enablePrompt();
 }
 
+prefix_ void senf::console::detail::ClientReader::translate(std::string & data)
+{
+    v_translate(data);
+}
+
+prefix_ senf::console::detail::ClientReader::ClientReader(Client & client)
+    : client_ (client)
+{}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_