h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-25 10:11:17 -03:00
Code Issues Packages Projects Releases Wiki Activity

Introduce get_by_sorted_name

Browse Source 
Given that we have several lists of things sorted by name, replace a
bunch of ad-hoc lower_bound calls with a single function.
This commit is contained in:
ridiculousfish
2021-08-26 13:40:02 -07:00
parent ee2d2caeaa
commit f577c221eb
6 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/input.cpp
View File

@@ -920,16 +920,8 @@ const wcstring_list_t &input_function_get_names() {
maybe_t<readline_cmd_t> input_function_get_code(const wcstring &name) {
// `input_function_metadata` is required to be kept in asciibetical order, making it OK to do
// a binary search for the matching name.
constexpr auto end = &input_function_metadata[0] + input_function_count;
auto result = std::lower_bound(
&input_function_metadata[0], end,
input_function_metadata_t{name.data(), static_cast<readline_cmd_t>(-1)},
[&](const input_function_metadata_t &lhs, const input_function_metadata_t &rhs) {
return wcscmp(lhs.name, rhs.name) < 0;
});
if (result != end && result->name[0] && name == result->name) {
return result->code;
if (const input_function_metadata_t *md = get_by_sorted_name(name, input_function_metadata)) {
return md->code;
}
return none();
}