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

Stop using env_var_t::to_list in a few places

Browse source 
We don't need the entire list in modifiable form here - some just needs
the size, the others can just get a reference.
This commit is contained in:
Fabian Homborg 2020-12-15 15:26:38 +01:00
parent b0dcfac2a0
commit 0f6669f43c
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/builtin_set.cpp
View file

@ -268,9 +268,8 @@ static bool validate_path_warning_on_colons(const wchar_t *cmd,
// where we are temporarily shadowing a variable, we want to compare against the shadowed value,
// not the (missing) local value. Also don't bother to complain about relative paths, which
// don't start with /.
wcstring_list_t existing_values;
const auto existing_variable = vars.get(key, ENV_DEFAULT);
if (!existing_variable.missing_or_empty()) existing_variable->to_list(existing_values);
const wcstring_list_t &existing_values = existing_variable ? existing_variable->as_list() : wcstring_list_t{};
for (const wcstring &dir : list) {
if (!string_prefixes_string(L"/", dir) || contains(existing_values, dir)) {
@ -371,8 +370,8 @@ static int parse_index(std::vector<long> &indexes, wchar_t *src, int scope, io_s
p++;
auto var_str = vars.get(src, scope);
wcstring_list_t var;
if (var_str) var_str->to_list(var);
size_t varsize = 0;
if (var_str) varsize = var_str->as_list().size();
int count = 0;
@ -386,7 +385,7 @@ static int parse_index(std::vector<long> &indexes, wchar_t *src, int scope, io_s
p = const_cast<wchar_t *>(end);
// Convert negative index to a positive index.
if (l_ind < 0) l_ind = var.size() + l_ind + 1;
if (l_ind < 0) l_ind = varsize + l_ind + 1;
if (*p == L'.' && *(p + 1) == L'.') {
p += 2;
@ -397,7 +396,7 @@ static int parse_index(std::vector<long> &indexes, wchar_t *src, int scope, io_s
p = const_cast<wchar_t *>(end);
// Convert negative index to a positive index.
if (l_ind2 < 0) l_ind2 = var.size() + l_ind2 + 1;
if (l_ind2 < 0) l_ind2 = varsize + l_ind2 + 1;
int direction = l_ind2 < l_ind ? -1 : 1;
for (long jjj = l_ind; jjj * direction <= l_ind2 * direction; jjj += direction) {
@ -536,11 +535,12 @@ static int builtin_set_query(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
if (idx_count) {
wcstring_list_t result;
size_t varsize = 0;
auto dest_str = parser.vars().get(dest, scope);
if (dest_str) dest_str->to_list(result);
if (dest_str) varsize = dest_str->as_list().size();
for (auto idx : indexes) {
if (idx < 1 || static_cast<size_t>(idx) > result.size()) retval++;
if (idx < 1 || static_cast<size_t>(idx) > varsize) retval++;
}
} else {
if (!parser.vars().get(arg, scope)) retval++;
@ -708,10 +708,12 @@ static int set_var_array(const wchar_t *cmd, const set_cmd_opts_t &opts, const w
if (opts.prepend) {
for (int i = 0; i < argc; i++) new_values.push_back(argv[i]);
}
auto var_str = parser.vars().get(varname, ENV_DEFAULT);
wcstring_list_t var_array;
if (var_str) var_str->to_list(var_array);
new_values.insert(new_values.end(), var_array.begin(), var_array.end());
if (var_str) {
const auto &var_array = var_str->as_list();
new_values.insert(new_values.end(), var_array.begin(), var_array.end());
}
if (opts.append) {
for (int i = 0; i < argc; i++) new_values.push_back(argv[i]);

3
src/expand.cpp
View file

@ -141,9 +141,8 @@ static bool is_quotable(const wcstring &str) {
wcstring expand_escape_variable(const env_var_t &var) {
wcstring buff;
wcstring_list_t lst;
const wcstring_list_t &lst = var.as_list();
var.to_list(lst);
for (size_t j = 0; j < lst.size(); j++) {
const wcstring &el = lst.at(j);
if (j) buff.append(L" ");

3
src/function.cpp
View file

@ -120,8 +120,7 @@ static void autoload_names(std::unordered_set<wcstring> &names, int get_hidden)
const auto path_var = vars.get(L"fish_function_path");
if (path_var.missing_or_empty()) return;
wcstring_list_t path_list;
path_var->to_list(path_list);
const wcstring_list_t &path_list = path_var->as_list();
for (i = 0; i < path_list.size(); i++) {
const wcstring &ndir_str = path_list.at(i);

5
src/path.cpp
View file

@ -138,8 +138,9 @@ wcstring_list_t path_get_paths(const wcstring &cmd, const environment_t &vars) {
}
auto path_var = vars.get(L"PATH");
wcstring_list_t pathsv;
if (path_var) path_var->to_list(pathsv);
if (!path_var) return paths;
const wcstring_list_t &pathsv = path_var->as_list();
for (auto path : pathsv) {
if (path.empty()) continue;
append_path_component(path, cmd);