Console: Implement ObjectDirectory proxy

[senf.git] / Console / Parse.hh

diff --git a/Console/Parse.hh b/Console/Parse.hh
index 4a5d32a..36cde7c 100644 (file)
--- a/Console/Parse.hh
+++ b/Console/Parse.hh
@@ -32,6 +32,7 @@
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/range/iterator_range.hpp>
+#include <boost/function.hpp>
 
 //#include "Parse.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -64,11 +65,14 @@ namespace console {
     class ParseCommandInfo
     {
         typedef std::vector<ArgumentToken> Tokens;
+        typedef std::vector<std::string> CommandPath;
         
     public:
+        typedef CommandPath::const_iterator path_iterator;
         typedef Tokens::const_iterator token_iterator;
         typedef boost::iterator_range<token_iterator> argument_value_type;
 
+
     private:
         typedef std::vector<argument_value_type> Arguments;
 
@@ -76,21 +80,29 @@ namespace console {
         typedef Arguments::const_iterator argument_iterator;
         typedef Arguments::size_type size_type;
 
-        std::string const & commandPath() const;
-        
-        size_type arguments() const;
-        argument_iterator begin_arguments() const;
-        argument_iterator end_arguments() const;
-        
-        size_type tokens() const;
-        token_iterator begin_tokens() const;
-        token_iterator end_tokens() const;
+        typedef boost::iterator_range<path_iterator> CommandPathRange;
+        typedef boost::iterator_range<argument_iterator> ArgumentsRange;
+        typedef boost::iterator_range<token_iterator> TokensRange;
+
+        enum BuiltinCommand { NoBuiltin, 
+                              BuiltinCD, 
+                              BuiltinLS, 
+                              BuiltinPUSHD, 
+                              BuiltinPOPD,
+                              BuiltinEXIT,
+                              BuiltinHELP };
+
+        BuiltinCommand builtin() const;
+        CommandPathRange commandPath() const;
+        ArgumentsRange arguments() const;
+        TokensRange tokens() const;
         
     protected:
 
     private:
         void init();
-        void setCommand(std::string const & commandPath);
+        void setBuiltin(BuiltinCommand builtin);
+        void setCommand(std::vector<std::string> & commandPath);
         void startArgument();
         void endArgument();
         void addToken(ArgumentToken const & token);
@@ -98,11 +110,12 @@ namespace console {
 
         struct MakeRange;
 
-        std::string commandPath_;
+        std::vector<std::string> commandPath_;
 
         typedef std::pair<Tokens::size_type, Tokens::size_type> TempArgumentRange;
         typedef std::vector<TempArgumentRange> TempArguments;
 
+        BuiltinCommand builtin_;
         Tokens tokens_;
         Arguments arguments_;
         TempArguments tempArguments_;
@@ -110,26 +123,31 @@ namespace console {
         friend class detail::ParserAccess;
     };
 
+    std::ostream & operator<<(std::ostream & stream, ParseCommandInfo const & info);
+
     /** \brief
       */
-    class SingleCommandParser
+    class CommandParser
         : boost::noncopyable
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
+        typedef boost::function<void (ParseCommandInfo const &)> Callback;
+
         ///////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
         ///@{
 
-        SingleCommandParser();
-        ~SingleCommandParser();
+        CommandParser();
+        ~CommandParser();
 
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
-        bool parseCommand(std::string command, ParseCommandInfo & info);
+        bool parse(std::string command, Callback cb);
+        bool parseFile(std::string filename, Callback cb);
 
     private:
         struct Impl;