github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-19 10:32:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let function-scoped variables be queried

Browse Source 
This uses the same logic we use to create the variables to find them -
go through the scopes, the topmost local scope *is* function-scope.

Fixes #8684
This commit is contained in:
Fabian Homborg 2022-03-10 18:26:45 +01:00
parent 895039ea5a
commit cf85bf9be3
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/env.cpp
View File

@ -600,6 +600,7 @@ class env_scoped_impl_t : public environment_t, noncopyable_t {
// query.
maybe_t<env_var_t> try_get_computed(const wcstring &key) const;
maybe_t<env_var_t> try_get_local(const wcstring &key) const;
maybe_t<env_var_t> try_get_function(const wcstring &key) const;
maybe_t<env_var_t> try_get_global(const wcstring &key) const;
maybe_t<env_var_t> try_get_universal(const wcstring &key) const;
@ -772,6 +773,22 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key) const {
return entry; // this is either the entry or none() from find_entry
}
maybe_t<env_var_t> env_scoped_impl_t::try_get_function(const wcstring &key) const {
maybe_t<env_var_t> entry;
auto node = locals_;
while (node->next) {
node = node->next;
// The first node that introduces a new scope is ours.
// If this doesn't happen, we go on until we've reached the
// topmost local scope.
if (node->new_scope) break;
}
for (auto cur = node; cur; cur=cur->next) {
if ((entry = cur->find_entry(key))) break;
}
return entry; // this is either the entry or none() from find_entry
}
maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key) const {
return globals_->find_entry(key);
}
@ -792,6 +809,9 @@ maybe_t<env_var_t> env_scoped_impl_t::get(const wcstring &key, env_mode_flags_t
if (!result && query.local) {
result = try_get_local(key);
}
if (!result && query.function) {
result = try_get_function(key);
}
if (!result && query.global) {
result = try_get_global(key);
}

23
tests/checks/set.fish
View File

@ -868,6 +868,29 @@ end
erase-funcvar
set -f foo
set -l banana
set -g global
begin
set -qf foo
and echo foo is function scoped
# CHECK: foo is function scoped
set -l localvar414
set -qf localvar414
or echo localvar414 is not function scoped
# CHECK: localvar414 is not function scoped
set -qf banana
and echo banana is function scoped
# CHECK: banana is function scoped
set -l global
set -qf global
or echo global is not function scoped
# CHECK: global is not function scoped
end
set --query $this_is_not_set
echo $status
# CHECK: 255