mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-19 03:31:14 +02:00
Code Releases Activity

39028: more join/split cases fixed and tested.

Browse source
This commit is contained in:
Barton E. Schaefer 2016-08-12 00:55:32 -07:00
parent 4234fccef6
commit 68e14c41f2
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-08-12 Barton E. Schaefer <schaefer@zsh.org>
* 39028: Src/subst.c, Test/D04parameter.ztst: more join/split
cases fixed and tested.
2016-08-10 Barton E. Schaefer <schaefer@zsh.org> 2016-08-10 Barton E. Schaefer <schaefer@zsh.org>
* 39019 (cf. PWS 39013): Src/subst.c, Test/D04parameter.ztst: * 39019 (cf. PWS 39013): Src/subst.c, Test/D04parameter.ztst:

7
Src/subst.c
View file

@ -3461,11 +3461,12 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
val = sepjoin(aval, sep, 1); val = sepjoin(aval, sep, 1);
isarr = 0; isarr = 0;
ms_flags = 0; ms_flags = 0;
} else if (force_split && nojoin == 2) { } else if (force_split && (spsep || nojoin == 2)) {
/* Hack to simulate splitting individual elements: /* Hack to simulate splitting individual elements:
* first join on what we later use to split * forced joining as previously determined, or
* join on what we later use to forcibly split
*/ */
val = sepjoin(aval, spsep, 1); val = sepjoin(aval, (nojoin == 1 ? sep : spsep), 1);
isarr = 0; isarr = 0;
} }
} }

10
Test/D04parameter.ztst
View file

@ -1970,8 +1970,14 @@
set -- one:two bucklemy:shoe set -- one:two bucklemy:shoe
IFS= IFS=
setopt shwordsplit setopt shwordsplit
print -l ${@} print -l ${@} ${(s.:.)*} ${(s.:.j.-.)*}
) )
0:Joining of $@ does not happen when IFS is empty 0:Joining of $@ does not happen when IFS is empty, but splitting $* does
>one:two >one:two
>bucklemy:shoe >bucklemy:shoe
>one
>twobucklemy
>shoe
>one
>two-bucklemy
>shoe