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

Introduce class environment_t

Browse Source 
This will be used as a base class for variable snapshots and variable stacks.
This commit is contained in:
ridiculousfish
2018-09-09 02:25:51 -07:00
parent 895c2c4af0
commit 391af6af0c
12 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/env.cpp
View File

@@ -1589,6 +1589,8 @@ void env_set_argv(const wchar_t *const *argv) {
}
}
environment_t::~environment_t() = default;
env_vars_snapshot_t::env_vars_snapshot_t(const wchar_t *const *keys) {
ASSERT_IS_MAIN_THREAD();
wcstring key;
@@ -1596,12 +1598,13 @@ env_vars_snapshot_t::env_vars_snapshot_t(const wchar_t *const *keys) {
key.assign(keys[i]);
const auto var = env_get(key);
if (var) {
vars[key] = *var;
vars[key] = std::move(*var);
}
}
}
env_vars_snapshot_t::env_vars_snapshot_t() {}
env_vars_snapshot_t::env_vars_snapshot_t() = default;
env_vars_snapshot_t::~env_vars_snapshot_t() = default;
// The "current" variables are not a snapshot at all, but instead trampoline to env_get, etc.
// We identify the current snapshot based on pointer values.
@@ -1610,10 +1613,10 @@ const env_vars_snapshot_t &env_vars_snapshot_t::current() { return sCurrentSnaps
bool env_vars_snapshot_t::is_current() const { return this == &sCurrentSnapshot; }
maybe_t<env_var_t> env_vars_snapshot_t::get(const wcstring &key) const {
maybe_t<env_var_t> env_vars_snapshot_t::get(const wcstring &key, env_mode_flags_t mode) const {
// If we represent the current state, bounce to env_get.
if (this->is_current()) {
return env_get(key);
return env_get(key, mode);
}
auto iter = vars.find(key);
if (iter == vars.end()) return none();