From 2071db355895f68d26f906549112e2e0f514bc98 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Wed, 1 Aug 2012 14:27:34 +0200
Subject: Tokens are CommandManager implementation details

CommandParameters go back to memoryview<String>
---
 src/command_manager.hh | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'src/command_manager.hh')

diff --git a/src/command_manager.hh b/src/command_manager.hh
index a0609c5e..c0d784a0 100644
--- a/src/command_manager.hh
+++ b/src/command_manager.hh
@@ -21,30 +21,7 @@ struct wrong_argument_count : runtime_error
     wrong_argument_count() : runtime_error("wrong argument count") {}
 };
 
-struct Token
-{
-    enum class Type
-    {
-        Raw,
-        ShellExpand,
-        CommandSeparator
-    };
-    Token() : m_type(Type::Raw) {}
-
-    explicit Token(const String& string) : m_content(string), m_type(Type::Raw) {}
-    explicit Token(Type type) : m_type(type) {}
-    Token(Type type, String str) : m_content(str), m_type(type) {}
-
-    Type type() const { return m_type; }
-
-    const String& content() const { return m_content; }
-
-private:
-    Type   m_type;
-    String m_content;
-};
-
-using CommandParameters = memoryview<Token>;
+using CommandParameters = memoryview<String>;
 
 typedef std::function<void (const CommandParameters&,
                             const Context& context)> Command;
@@ -74,8 +51,6 @@ class CommandManager : public Singleton<CommandManager>
 public:
     void execute(const String& command_line, const Context& context,
                  const EnvVarMap& env_vars = EnvVarMap());
-    void execute(const CommandParameters& params, const Context& context,
-                 const EnvVarMap& env_vars = EnvVarMap());
 
     Completions complete(const String& command_line, size_t cursor_pos);
 
-- 
cgit v1.2.3