h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-04 07:21:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Convert more event queue push_front loops to insert_front

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi
2021-02-08 12:09:17 -06:00
parent 5c014e129a
commit 2c1764fd45
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/input.cpp
View File

@@ -357,10 +357,7 @@ void inputter_t::function_push_args(readline_cmd_t code) {
} }
// Push the function codes back into the input stream. // Push the function codes back into the input stream.
size_t idx = skipped.size(); event_queue_.insert_front(skipped.begin(), skipped.end());
while (idx--) {
event_queue_.push_front(skipped.at(idx));
}
} }
/// Perform the action of the specified binding. allow_commands controls whether fish commands /// Perform the action of the specified binding. allow_commands controls whether fish commands
@@ -432,7 +429,7 @@ bool inputter_t::mapping_is_match(const input_mapping_t &m) {
// something else). Undo consumption of the read characters since we didn't match the // something else). Undo consumption of the read characters since we didn't match the
// bind sequence and abort. // bind sequence and abort.
event_queue_.push_front(evt); event_queue_.push_front(evt);
while (i--) event_queue_.push_front(str[i]); event_queue_.insert_front(str.begin(), str.begin() + i);
return false; return false;
} }
@@ -601,6 +598,7 @@ char_event_t inputter_t::read_characters_no_readline() {
break; break;
} }
} }
// Restore any readline functions // Restore any readline functions
event_queue_.insert_front(saved_events.cbegin(), saved_events.cend()); event_queue_.insert_front(saved_events.cbegin(), saved_events.cend());
return evt_to_return; return evt_to_return;
@@ -811,6 +809,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
wcstring_list_t input_terminfo_get_names(bool skip_null) { wcstring_list_t input_terminfo_get_names(bool skip_null) {
assert(s_input_initialized); assert(s_input_initialized);
wcstring_list_t result; wcstring_list_t result;
const auto &mappings = *s_terminfo_mappings; const auto &mappings = *s_terminfo_mappings;
result.reserve(mappings.size()); result.reserve(mappings.size());