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

Instantize env_set

Browse Source 
Switch env_set to an instance method on environmnet_t.
This commit is contained in:
ridiculousfish
2018-09-14 00:36:26 -07:00
parent 421fbdd52a
commit c1dd284b3e
19 changed files with 193 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/function.cpp
View File

@@ -353,7 +353,7 @@ void function_prepare_environment(env_stack_t &vars, const wcstring &name,
const wchar_t *const *arg = argv;
for (const wcstring &named_arg : props->named_arguments) {
if (*arg) {
env_set_one(named_arg, ENV_LOCAL | ENV_USER, *arg);
vars.set_one(named_arg, ENV_LOCAL | ENV_USER, *arg);
arg++;
} else {
vars.set_empty(named_arg, ENV_LOCAL | ENV_USER);
@@ -362,6 +362,6 @@ void function_prepare_environment(env_stack_t &vars, const wcstring &name,
}
for (const auto &kv : inherited_vars) {
env_set(kv.first, ENV_LOCAL | ENV_USER, kv.second.as_list());
vars.set(kv.first, ENV_LOCAL | ENV_USER, kv.second.as_list());
}
}