mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-06-02 21:36:05 +02:00
36347: Fix appending empty array to associations
This commit is contained in:
parent
cbe00216fe
commit
8e3ca08f13
|
@ -1,3 +1,10 @@
|
||||||
|
2015-09-01 Mikael Magnusson <mikachu@gmail.com>
|
||||||
|
|
||||||
|
* 36380: Src/utils.c: Avoid gcc case syntax
|
||||||
|
|
||||||
|
* 36347: Src/params.c, Test/A06assign.ztst: Fix appending empty
|
||||||
|
array to associations
|
||||||
|
|
||||||
2015-09-01 Barton E. Schaefer <schaefer@zsh.org>
|
2015-09-01 Barton E. Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
* 36376: Src/utils.c: handle signals during read1char() so it is
|
* 36376: Src/utils.c: handle signals during read1char() so it is
|
||||||
|
|
|
@ -3312,9 +3312,12 @@ arrhashsetfn(Param pm, char **val, int augment)
|
||||||
zerr("bad set of key/value pairs for associative array");
|
zerr("bad set of key/value pairs for associative array");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (alen)
|
if (augment) {
|
||||||
if (!(augment && (ht = paramtab = pm->gsu.h->getfn(pm))))
|
ht = paramtab = pm->gsu.h->getfn(pm);
|
||||||
ht = paramtab = newparamtable(17, pm->node.nam);
|
}
|
||||||
|
if (alen && (!augment || !paramtab)) {
|
||||||
|
ht = paramtab = newparamtable(17, pm->node.nam);
|
||||||
|
}
|
||||||
while (*aptr) {
|
while (*aptr) {
|
||||||
/* The parameter name is ztrdup'd... */
|
/* The parameter name is ztrdup'd... */
|
||||||
v->pm = createparam(*aptr, PM_SCALAR|PM_UNSET);
|
v->pm = createparam(*aptr, PM_SCALAR|PM_UNSET);
|
||||||
|
|
|
@ -249,6 +249,14 @@
|
||||||
>2
|
>2
|
||||||
>3
|
>3
|
||||||
|
|
||||||
|
typeset -A h
|
||||||
|
h=(a 1 b 2)
|
||||||
|
h+=()
|
||||||
|
print -l $h
|
||||||
|
0:add empty array to association
|
||||||
|
>1
|
||||||
|
>2
|
||||||
|
|
||||||
# tests of var[range]+=scalar
|
# tests of var[range]+=scalar
|
||||||
|
|
||||||
s=sting
|
s=sting
|
||||||
|
|
Loading…
Reference in New Issue