Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions crates/bashkit/src/interpreter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6312,20 +6312,22 @@ impl Interpreter {
.strip_suffix("[@]")
.or_else(|| name.strip_suffix("[*]"))
{
// Resolve nameref: if arr_name is a nameref, follow it to the target
let resolved_arr_name = self.resolve_nameref(arr_name);
let sep = if is_star {
self.get_ifs_separator()
} else {
" ".to_string()
};
if let Some(arr) = self.assoc_arrays.get(arr_name) {
if let Some(arr) = self.assoc_arrays.get(resolved_arr_name) {
let is_set = !arr.is_empty();
let mut keys: Vec<_> = arr.keys().collect();
keys.sort();
let values: Vec<String> =
keys.iter().filter_map(|k| arr.get(*k).cloned()).collect();
return (is_set, values.join(&sep));
}
if let Some(arr) = self.arrays.get(arr_name) {
if let Some(arr) = self.arrays.get(resolved_arr_name) {
let is_set = !arr.is_empty();
let mut indices: Vec<_> = arr.keys().collect();
indices.sort();
Expand All @@ -6343,15 +6345,17 @@ impl Interpreter {
&& name.ends_with(']')
{
let arr_name = &name[..bracket];
// Resolve nameref: if arr_name is a nameref, follow it to the target
let resolved_arr_name = self.resolve_nameref(arr_name);
let key = &name[bracket + 1..name.len() - 1];
if let Some(arr) = self.assoc_arrays.get(arr_name) {
if let Some(arr) = self.assoc_arrays.get(resolved_arr_name) {
let expanded_key = self.expand_variable_or_literal(key);
return match arr.get(&expanded_key) {
Some(v) => (true, v.clone()),
None => (false, String::new()),
};
}
if let Some(arr) = self.arrays.get(arr_name)
if let Some(arr) = self.arrays.get(resolved_arr_name)
&& let Ok(idx) = key.parse::<usize>()
{
return match arr.get(&idx) {
Expand Down
54 changes: 54 additions & 0 deletions crates/bashkit/tests/spec_cases/bash/nameref.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,57 @@ echo "$result"
### expect
computed
### end

### nameref_assoc_default_value
# ${ref[key]:-default} through nameref to assoc array (issue #801)
declare -A m=([x]=1 [y]=2)
f() {
local -n ref="$1"
echo "${ref[x]:-EMPTY}"
echo "${ref[y]:-EMPTY}"
echo "${ref[z]:-EMPTY}"
}
f m
### expect
1
2
EMPTY
### end

### nameref_assoc_replacement
# ${ref[key]:+alt} through nameref to assoc array
declare -A m=([a]=val)
f() {
local -n ref="$1"
echo "${ref[a]:+found}"
echo "${ref[missing]:+found}"
}
f m
### expect
found

### end

### nameref_assoc_subscript_at_default
# ${ref[@]:-default} through nameref to assoc array
declare -A m=([k]=v)
f() {
local -n ref="$1"
echo "${ref[@]:-EMPTY}"
}
f m
### expect
v
### end

### nameref_assoc_subscript_at_empty
# ${ref[@]:-default} through nameref to empty assoc array
declare -A m
f() {
local -n ref="$1"
echo "${ref[@]:-EMPTY}"
}
f m
### expect
EMPTY
### end
Loading