Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the op from env_dispatch

Browse source 
Environment dispatch passes strings like "ERASE" and "SET" but nobody
ever looks at those. Just get rid of them.
This commit is contained in:
ridiculousfish 2019-04-08 12:37:38 -07:00
parent dc729653be
commit 987e41de12
3 changed files with 19 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/env.cpp
View file

@ -972,7 +972,7 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
} }
event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key})); event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
env_dispatch_var_change(L"SET", key, *this); env_dispatch_var_change(key, *this);
return ENV_OK; return ENV_OK;
} }
@ -1058,7 +1058,7 @@ int env_stack_t::remove(const wcstring &key, int var_mode) {
if (is_exported) vars_stack().mark_changed_exported(); if (is_exported) vars_stack().mark_changed_exported();
} }
env_dispatch_var_change(L"ERASE", key, *this); env_dispatch_var_change(key, *this);
return erased ? ENV_OK : ENV_NOT_FOUND; return erased ? ENV_OK : ENV_NOT_FOUND;
} }

49
src/env_dispatch.cpp
View file

@ -83,7 +83,7 @@ extern const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL",
extern const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"}); extern const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
class var_dispatch_table_t { class var_dispatch_table_t {
using named_callback_t = std::function<void(const wcstring &, const wcstring &, env_stack_t &)>; using named_callback_t = std::function<void(const wcstring &, env_stack_t &)>;
std::unordered_map<wcstring, named_callback_t> named_table_; std::unordered_map<wcstring, named_callback_t> named_table_;
using anon_callback_t = std::function<void(env_stack_t &)>; using anon_callback_t = std::function<void(env_stack_t &)>;
@ -108,10 +108,10 @@ class var_dispatch_table_t {
anon_table_.emplace(std::move(name), std::move(cb)); anon_table_.emplace(std::move(name), std::move(cb));
} }
void dispatch(const wchar_t *op, const wcstring &key, env_stack_t &vars) const { void dispatch(const wcstring &key, env_stack_t &vars) const {
auto named = named_table_.find(key); auto named = named_table_.find(key);
if (named != named_table_.end()) { if (named != named_table_.end()) {
named->second(op, key, vars); named->second(key, vars);
} }
auto anon = anon_table_.find(key); auto anon = anon_table_.find(key);
if (anon != anon_table_.end()) { if (anon != anon_table_.end()) {
@ -192,12 +192,12 @@ static void guess_emoji_width(const environment_t &vars) {
} }
/// React to modifying the given variable. /// React to modifying the given variable.
void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars) { void env_dispatch_var_change(const wcstring &key, env_stack_t &vars) {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
// Do nothing if not yet fully initialized. // Do nothing if not yet fully initialized.
if (!s_var_dispatch_table) return; if (!s_var_dispatch_table) return;
s_var_dispatch_table->dispatch(op, key, vars); s_var_dispatch_table->dispatch(key, vars);
// Eww. // Eww.
if (string_prefixes_string(L"fish_color_", key)) { if (string_prefixes_string(L"fish_color_", key)) {
@ -210,7 +210,7 @@ void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t
static void universal_callback(env_stack_t *stack, const callback_data_t &cb) { static void universal_callback(env_stack_t *stack, const callback_data_t &cb) {
const wchar_t *op = cb.is_erase() ? L"ERASE" : L"SET"; const wchar_t *op = cb.is_erase() ? L"ERASE" : L"SET";
env_dispatch_var_change(op, cb.key, *stack); env_dispatch_var_change(cb.key, *stack);
stack->mark_changed_exported(); stack->mark_changed_exported();
event_fire(event_t::variable(cb.key, {L"VARIABLE", op, cb.key})); event_fire(event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));
} }
@ -221,18 +221,14 @@ void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &cal
} }
} }
static void handle_fish_term_change(const wcstring &op, const wcstring &var_name, static void handle_fish_term_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
UNUSED(var_name); UNUSED(var_name);
update_fish_color_support(vars); update_fish_color_support(vars);
reader_react_to_color_change(); reader_react_to_color_change();
} }
static void handle_change_ambiguous_width(const wcstring &op, const wcstring &var_name, static void handle_change_ambiguous_width(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) { UNUSED(var_name);
(void)op;
(void)var_name;
int new_width = 1; int new_width = 1;
if (auto width_str = vars.get(L"fish_ambiguous_width")) { if (auto width_str = vars.get(L"fish_ambiguous_width")) {
new_width = fish_wcstol(width_str->as_string().c_str()); new_width = fish_wcstol(width_str->as_string().c_str());
@ -240,52 +236,39 @@ static void handle_change_ambiguous_width(const wcstring &op, const wcstring &va
g_fish_ambiguous_width = std::max(0, new_width); g_fish_ambiguous_width = std::max(0, new_width);
} }
static void handle_term_size_change(const wcstring &op, const wcstring &var_name, static void handle_term_size_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
UNUSED(var_name); UNUSED(var_name);
UNUSED(vars); UNUSED(vars);
invalidate_termsize(true); // force fish to update its idea of the terminal size plus vars invalidate_termsize(true); // force fish to update its idea of the terminal size plus vars
} }
static void handle_read_limit_change(const wcstring &op, const wcstring &var_name, static void handle_read_limit_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
UNUSED(var_name); UNUSED(var_name);
vars.set_read_limit(); vars.set_read_limit();
} }
static void handle_fish_history_change(const wcstring &op, const wcstring &var_name, static void handle_fish_history_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
UNUSED(var_name); UNUSED(var_name);
reader_change_history(history_session_id(vars)); reader_change_history(history_session_id(vars));
} }
static void handle_function_path_change(const wcstring &op, const wcstring &var_name, static void handle_function_path_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
UNUSED(var_name); UNUSED(var_name);
UNUSED(vars); UNUSED(vars);
function_invalidate_path(); function_invalidate_path();
} }
static void handle_complete_path_change(const wcstring &op, const wcstring &var_name, static void handle_complete_path_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
UNUSED(var_name); UNUSED(var_name);
UNUSED(vars); UNUSED(vars);
complete_invalidate_path(); complete_invalidate_path();
} }
static void handle_tz_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) { static void handle_tz_change(const wcstring &var_name, env_stack_t &vars) {
UNUSED(op);
handle_timezone(var_name.c_str(), vars); handle_timezone(var_name.c_str(), vars);
} }
static void handle_magic_colon_var_change(const wcstring &op, const wcstring &var_name, static void handle_magic_colon_var_change(const wcstring &var_name, env_stack_t &vars) {
env_stack_t &vars) {
UNUSED(op);
fix_colon_delimited_var(var_name, vars); fix_colon_delimited_var(var_name, vars);
} }

2
src/env_dispatch.h
View file

@ -14,7 +14,7 @@ class environment_t;
void env_dispatch_init(const environment_t &vars); void env_dispatch_init(const environment_t &vars);
class env_stack_t; class env_stack_t;
void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars); void env_dispatch_var_change(const wcstring &key, env_stack_t &vars);
void guess_emoji_width(); void guess_emoji_width();
void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks); void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks);