[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.7,1.8 eshell.h,1.4,1.5

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21598/lib/eshell

Modified Files:
	eshell.cpp eshell.h 
Log Message:
brought up to date with s11n 0.9pre2

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eshell.cpp	1 Jun 2004 06:58:31 -0000	1.7
+++ eshell.cpp	2 Jun 2004 06:57:44 -0000	1.8
@@ -13,7 +13,7 @@
 #  include <boost/timer.hpp>
 #endif
 
-#include <s11n.net/t5x/key_value_parser.hpp>
+#include <s11n.net/acme/key_value_parser.hpp>
 #include <s11n.net/stringutil/string_util.hpp> // trim_string()
 #include <s11n.net/stringutil/stdstring_tokenizer.hpp> // trim_string()
 #include <eshell/ShellProcess.h>
@@ -29,8 +29,8 @@
 #endif
 
 #include <s11n.net/phoenix/phoenix.hpp>
-#include <s11n.net/t5x/aliaser.hpp>
-#include <s11n.net/t5x/environment.hpp>
+#include <s11n.net/acme/aliaser.hpp>
+#include <s11n.net/acme/environment.hpp>
 
 
 #if HAVE_LIBREADLINECPP
@@ -41,8 +41,8 @@
 #define ESHELLDEBUG if( env().get_bool( "debug", false ) ) CERR
 namespace eshell {
 
-        using t5x::aliaser;
-        using t5x::environment;
+        using acme::aliaser;
+        using acme::environment;
 
         struct eshell_sharing_context {}; // private type for use with phoenix<>
 
@@ -105,7 +105,7 @@
 
         void init( int argc, char ** argv )
         {
-                t5x::argv_parser & a = t5x::argv_parser::args( argc, argv );
+                acme::argv_parser & a = acme::argv_parser::args( argc, argv );
                 if( a.get_bool( "classloader-debug", false ) )
                 {
                         cl::class_loader_debug_level( 1 );
@@ -117,19 +117,19 @@
                 cllite::class_path().add_path( "." );
         }
 
-        t5x::environment & env()
+        acme::environment & env()
         {
-                return t5x::environment::env();
+                return acme::environment::env();
         }
 
-        t5x::argv_parser & args()
+        acme::argv_parser & args()
         {
-                return t5x::argv_parser::args();
+                return acme::argv_parser::args();
         }
 
-        t5x::aliaser & aliases()
+        acme::aliaser & aliases()
         {
-                return phoenix::phoenix<t5x::aliaser,commander_map>::instance();
+                return phoenix::phoenix<acme::aliaser,commander_map>::instance();
         }
 
 
@@ -326,7 +326,7 @@
                         }
                         arguments::args_list::const_iterator cit = args.argv().begin();
                         ++cit; // discard arg0
-                        t5x::key_value_parser kp;
+                        acme::key_value_parser kp;
                         if( ! kp.parse( *cit ) )
                         {
                                 os << "set: unparseable tokens: ["<<(*cit)<<"]"<< std::endl;
@@ -432,7 +432,7 @@
 
                         if( std::string::npos != rest.find_first_of( "=" ) )
                         { // alias foo=bar
-                                t5x::key_value_parser kp;
+                                acme::key_value_parser kp;
                                 if( ! kp.parse( rest ) )
                                 {
                                         os << "alias: unparseable tokens: ["<<rest<<"]"<< std::endl;

Index: eshell.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eshell.h	1 Jun 2004 06:58:31 -0000	1.4
+++ eshell.h	2 Jun 2004 06:57:44 -0000	1.5
@@ -12,9 +12,9 @@
 
 #include "eshell_config.h"
 
-#include <s11n.net/t5x/environment.hpp>
-#include <s11n.net/t5x/aliaser.hpp>
-#include <s11n.net/t5x/argv_parser.hpp>
+#include <s11n.net/acme/environment.hpp>
+#include <s11n.net/acme/aliaser.hpp>
+#include <s11n.net/acme/argv_parser.hpp>
 #include <s11n.net/stringutil/stdstring_tokenizer.hpp>
 
 #include <s11n.net/s11n/s11nlite.hpp>
@@ -131,18 +131,18 @@
            See the docs for environment::propagate_sets(): that is set
            to true in the returned object.
         */
-        t5x::environment & env();
+        acme::environment & env();
 
         /**
            Returns the arguments passed in to eshell::init(). The returned
            object is not valid before eshell::init() is called.
         */
-        t5x::argv_parser & args();
+        acme::argv_parser & args();
 
         /**
            Returns this shell's aliases
         */
-        t5x::aliaser & aliases();
+        acme::aliaser & aliases();
 
         /**
            Splits command into tokens and pass them to