Console: More simple argument parsing (argument iterator wrapper)

[senf.git] / Console / testServer.cc

diff --git a/Console/testServer.cc b/Console/testServer.cc
index 429d959..1d0ed58 100644 (file)
--- a/Console/testServer.cc
+++ b/Console/testServer.cc
@@ -32,14 +32,11 @@ namespace kw = senf::console::kw;
 
 void echo(std::ostream & output, senf::console::ParseCommandInfo const & command)
 {
-    typedef senf::console::ParseCommandInfo::ArgumentsRange::iterator iterator;
-    iterator i (command.arguments().begin());
-    iterator i_end (command.arguments().end());
+    typedef senf::console::ParseCommandInfo::TokensRange::iterator iterator;
+    iterator i (command.tokens().begin());
+    iterator i_end (command.tokens().end());
     for (; i != i_end; ++i) {
-        iterator::value_type::iterator j (i->begin());
-        iterator::value_type::iterator j_end (i->end());
-        for (; j != j_end; ++j) 
-            output << j->value() << ' ';
+        output << i->value() << ' ';
     }
     output << "\n";
 }
@@ -110,10 +107,10 @@ int main(int, char **)
 
     TestObject test;
     testDir
-        .add("testob", test.dir)
+        .add("extra", test.dir)
         .doc("Example of an instance directory");
 
-    senf::console::Server::start( senf::INet4SocketAddress(23232) )
+    senf::console::Server::start( senf::INet4SocketAddress(23232u) )
         .name("testServer");
 
     senf::Scheduler::instance().process();