xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup in make_completer, use std::decay

Browse Source
This commit is contained in:
Maxime Coste 2016-09-19 23:26:52 +01:00
parent 80413e1e3a
commit 4f874a3679
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands.cc
View File

@ -97,12 +97,8 @@ struct PerArgumentCommandCompleter<Completer, Rest...> : PerArgumentCommandCompl
Completer m_completer; Completer m_completer;
}; };
template<typename... Completers> template<typename... Completers>
PerArgumentCommandCompleter< PerArgumentCommandCompleter<typename std::decay<Completers>::type...>
typename std::remove_cv<
typename std::remove_reference<Completers>::type
>::type...>
make_completer(Completers&&... completers) make_completer(Completers&&... completers)
{ {
return {std::forward<Completers>(completers)...}; return {std::forward<Completers>(completers)...};
@ -158,7 +154,7 @@ static Completions complete_buffer_name(const Context& context, CompletionFlags
return { 0, cursor_pos, res }; return { 0, cursor_pos, res };
} }
auto buffer_completer = make_completer(&complete_buffer_name); auto buffer_completer = make_completer(complete_buffer_name);
const ParameterDesc no_params{ {}, ParameterDesc::Flags::None, 0, 0 }; const ParameterDesc no_params{ {}, ParameterDesc::Flags::None, 0, 0 };
const ParameterDesc single_name_param{ {}, ParameterDesc::Flags::None, 1, 1 }; const ParameterDesc single_name_param{ {}, ParameterDesc::Flags::None, 1, 1 };
@ -755,7 +751,7 @@ const CommandDesc add_hook_cmd = {
}, },
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
make_completer(&complete_scope, &complete_nothing, &complete_nothing, make_completer(complete_scope, complete_nothing, complete_nothing,
[](const Context& context, CompletionFlags flags, [](const Context& context, CompletionFlags flags,
const String& prefix, ByteCount cursor_pos) const String& prefix, ByteCount cursor_pos)
{ return CommandManager::instance().complete( { return CommandManager::instance().complete(
@ -1017,7 +1013,7 @@ const CommandDesc alias_cmd = {
ParameterDesc{{}, ParameterDesc::Flags::None, 3, 3}, ParameterDesc{{}, ParameterDesc::Flags::None, 3, 3},
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
make_completer(&complete_scope, &complete_nothing, &complete_command_name), make_completer(complete_scope, complete_nothing, complete_command_name),
[](const ParametersParser& parser, Context& context, const ShellContext&) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (not CommandManager::instance().command_defined(parser[2])) if (not CommandManager::instance().command_defined(parser[2]))
@ -1036,7 +1032,7 @@ const CommandDesc unalias_cmd = {
ParameterDesc{{}, ParameterDesc::Flags::None, 2, 3}, ParameterDesc{{}, ParameterDesc::Flags::None, 2, 3},
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
make_completer(&complete_scope, &complete_nothing, &complete_command_name), make_completer(complete_scope, complete_nothing, complete_command_name),
[](const ParametersParser& parser, Context& context, const ShellContext&) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
AliasRegistry& aliases = get_scope(parser[0], context).aliases(); AliasRegistry& aliases = get_scope(parser[0], context).aliases();
@ -1899,7 +1895,7 @@ const CommandDesc face_cmd = {
ParameterDesc{{}, ParameterDesc::Flags::None, 2, 2}, ParameterDesc{{}, ParameterDesc::Flags::None, 2, 2},
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
make_completer(&complete_face, &complete_face), make_completer(complete_face, complete_face),
[](const ParametersParser& parser, Context& context, const ShellContext&) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
FaceRegistry::instance().register_alias(parser[0], parser[1], true); FaceRegistry::instance().register_alias(parser[0], parser[1], true);