[core refactor] Refactor the code for BashAssoc unset -v a[k]

oils-for-unix · Dec 2, 2024 · 1791139 · 1791139
1 parent a61375f
commit 1791139
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/core/bash_impl.py b/core/bash_impl.py
@@ -198,6 +198,12 @@ def BashAssoc_SetElement(assoc_val, key, s):
     assoc_val.d[key] = s
 
 
+def BashAssoc_UnsetElement(assoc_val, key):
+    # type: (value.BashAssoc, str) -> None
+
+    mylib.dict_erase(assoc_val.d, key)
+
+
 def BashAssoc_ToStrForShellPrint(assoc_val):
     # type: (value.BashAssoc) -> str
 

diff --git a/core/state.py b/core/state.py
@@ -2302,7 +2302,7 @@ def Unset(self, lval, which_scopes):
                 #  raise error.Runtime("%r isn't an associative array" % lval.name)
 
                 val = cast(value.BashAssoc, UP_val)
-                mylib.dict_erase(val.d, lval.key)
+                bash_impl.BashAssoc_UnsetElement(val, lval.key)
 
             else:
                 raise AssertionError(lval)

diff --git a/spec/array.test.sh b/spec/array.test.sh
@@ -897,8 +897,8 @@ unset -v 'a[-2]'
 ## END
 ## STDERR:
   unset -v 'a[-2]'
-  ^~~~~
-[ stdin ]:4: fatal: Index -2 is out of bounds for array of length 1
+           ^
+[ stdin ]:4: a[-2]: Index is out of bounds for array of length 1
 ## END
 
 ## OK bash STDERR: