h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-02 17:31:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor function_prepare_environment

Browse Source 
Migrate it into exec.cpp to reduce the complexity of
exec_block_or_func_process.
This commit is contained in:
ridiculousfish
2019-11-10 14:46:21 -08:00
parent ac2eed2ffa
commit b0cf94e3ba
3 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/function.cpp
View File

@@ -364,28 +364,3 @@ void function_invalidate_path() {
}
funcset->autoloader.clear();
}
// Setup the environment for the function. There are three components of the environment:
// 1. argv
// 2. named arguments
// 3. inherited variables
void function_prepare_environment(env_stack_t &vars, const wcstring &name, wcstring_list_t argv,
const std::map<wcstring, env_var_t> &inherited_vars) {
vars.set_argv(argv);
auto props = function_get_properties(name);
if (props && !props->named_arguments.empty()) {
auto argv_iter = argv.cbegin();
for (const wcstring &named_arg : props->named_arguments) {
if (argv_iter != argv.cend()) {
vars.set_one(named_arg, ENV_LOCAL | ENV_USER, std::move(*argv_iter));
++argv_iter;
} else {
vars.set_empty(named_arg, ENV_LOCAL | ENV_USER);
}
}
}
for (const auto &kv : inherited_vars) {
vars.set(kv.first, ENV_LOCAL | ENV_USER, kv.second.as_list());
}
}