summaryrefslogtreecommitdiff
path: root/src/command_manager.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-11-04 16:00:34 +0800
committerMaxime Coste <mawww@kakoune.org>2017-11-04 16:02:21 +0800
commit6bac767124a1e8b776b7169f2cae6dde245cc195 (patch)
tree0e1df608bb2921c03b943b19e1041ac1d7bd4b03 /src/command_manager.cc
parent7f51e51fcbfc1b3070711d2421dd248cdb1b8b22 (diff)
CommandManager: tweak naming
Diffstat (limited to 'src/command_manager.cc')
-rw-r--r--src/command_manager.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc
index 2a1e865f..a8e58aad 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -22,14 +22,14 @@ bool CommandManager::command_defined(StringView command_name) const
}
void CommandManager::register_command(String command_name,
- Command command,
+ CommandFunc func,
String docstring,
ParameterDesc param_desc,
CommandFlags flags,
CommandHelper helper,
CommandCompleter completer)
{
- m_commands[command_name] = { std::move(command),
+ m_commands[command_name] = { std::move(func),
std::move(docstring),
std::move(param_desc),
flags,
@@ -411,8 +411,8 @@ String expand(StringView str, const Context& context,
struct command_not_found : runtime_error
{
- command_not_found(StringView command)
- : runtime_error(command + " : no such command") {}
+ command_not_found(StringView name)
+ : runtime_error(name + " : no such command") {}
};
CommandManager::CommandMap::const_iterator
@@ -458,7 +458,7 @@ void CommandManager::execute_single_command(CommandParameters params,
{
ParametersParser parameter_parser(param_view,
command_it->value.param_desc);
- command_it->value.command(parameter_parser, context, shell_context);
+ command_it->value.func(parameter_parser, context, shell_context);
}
catch (runtime_error& error)
{