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

Stop copying strings in var_stack_t::var_changed

Browse source 
var_stack_t::var_changed was doing tons of unnecessary string copies.
Fix that and make its name clearer.
This commit is contained in:
ridiculousfish 2017-12-22 16:27:47 -08:00
parent aa22c744d2
commit 05b5e8e4f8
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/env.cpp
View file

@ -157,6 +157,8 @@ class env_node_t {
std::unique_ptr<env_node_t> next; std::unique_ptr<env_node_t> next;
maybe_t<env_var_t> find_entry(const wcstring &key); maybe_t<env_var_t> find_entry(const wcstring &key);
bool contains_any_of(const wcstring_list_t &vars) const;
}; };
class variable_entry_t { class variable_entry_t {
@ -196,8 +198,6 @@ struct var_stack_t {
// Pops the top node if it's not global // Pops the top node if it's not global
void pop(); void pop();
bool var_changed(const wcstring_list_t &vars);
// Returns the next scope to search for a given node, respecting the new_scope lag // Returns the next scope to search for a given node, respecting the new_scope lag
// Returns NULL if we're done // Returns NULL if we're done
env_node_t *next_scope_to_search(env_node_t *node); env_node_t *next_scope_to_search(env_node_t *node);
@ -228,10 +228,10 @@ void var_stack_t::push(bool new_scope) {
} }
} }
/// Return true if one of the vars in the passed list was changed in the current var scope. /// Return true if if the node contains any of the entries in the vars list.
bool var_stack_t::var_changed(const wcstring_list_t &vars) { bool env_node_t::contains_any_of(const wcstring_list_t &vars) const {
for (auto v : vars) { for (const auto &v : vars) {
if (top->env.find(v) != top->env.end()) return true; if (env.count(v)) return true;
} }
return false; return false;
} }
@ -244,8 +244,8 @@ void var_stack_t::pop() {
return; return;
} }
bool locale_changed = this->var_changed(locale_variables); bool locale_changed = top->contains_any_of(locale_variables);
bool curses_changed = this->var_changed(curses_variables); bool curses_changed = top->contains_any_of(curses_variables);
if (top->new_scope) { //!OCLINT(collapsible if statements) if (top->new_scope) { //!OCLINT(collapsible if statements)
if (top->exportv || local_scope_exports(top->next.get())) { if (top->exportv || local_scope_exports(top->next.get())) {