diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2012-08-01 14:27:34 +0200 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2012-08-01 14:27:34 +0200 |
| commit | 2071db355895f68d26f906549112e2e0f514bc98 (patch) | |
| tree | ff509ca88ee969784d8c6dd06462d8e879d9693a /src/command_manager.hh | |
| parent | 36070dd429af69f1042f4ee56488a960c4d8e7ef (diff) | |
Tokens are CommandManager implementation details
CommandParameters go back to memoryview<String>
Diffstat (limited to 'src/command_manager.hh')
| -rw-r--r-- | src/command_manager.hh | 27 |
1 files changed, 1 insertions, 26 deletions
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); |
