D04parameter fails on OSX

D04parameter fails on OSX

[İsmail Dönmez]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

Hi;

zsh.git running on OSX 10.7.3

./D04parameter.ztst: starting.
*** /tmp/zsh.ztst.out.6163 Thu Apr 12 16:27:14 2012
--- /tmp/zsh.ztst.tout.6163 Thu Apr 12 16:27:14 2012
***************
*** 3,7 ****
--- 3,8 ----
  said
  i
  will
+ will
  and
  didJOYCE
Test ./D04parameter.ztst failed: output differs from expected as shown
above for:
  print -l JAMES${(u)${=:-$(echo yes yes she said yes i will yes she said
she will and yes she did yes)}}JOYCE
Was testing: New hash seive unique algorithm for arrays of more than 10
elements


Regards,
ismail

Re: D04parameter fails on OSX

[Peter Stephenson]

On Thu, 12 Apr 2012 16:28:47 +0200
İsmail Dönmez <ismail@namtrac.org> wrote:
> ./D04parameter.ztst: starting.
> *** /tmp/zsh.ztst.out.6163 Thu Apr 12 16:27:14 2012
> --- /tmp/zsh.ztst.tout.6163 Thu Apr 12 16:27:14 2012
> ***************
> *** 3,7 ****
> --- 3,8 ----
>   said
>   i
>   will
> + will
>   and
>   didJOYCE
> Test ./D04parameter.ztst failed: output differs from expected as shown
> above for:
>   print -l JAMES${(u)${=:-$(echo yes yes she said yes i will yes she said
> she will and yes she did yes)}}JOYCE
> Was testing: New hash seive unique algorithm for arrays of more than 10
> elements

Does this help?

Index: Src/params.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/params.c,v
retrieving revision 1.179
diff -p -u -r1.179 params.c
--- Src/params.c	10 Apr 2012 01:17:03 -0000	1.179
+++ Src/params.c	12 Apr 2012 19:28:33 -0000
@@ -3532,7 +3532,7 @@ arrayuniq(char **x, int freeok)
     }
 
     for (it = x, write_it = x; *it;) {
-	if (! gethashnode(ht, *it)) {
+	if (! gethashnode2(ht, *it)) {
 	    HashNode new_node = zhalloc(sizeof(struct hashnode));
 	    if (!new_node) {
 		/* Oops, out of heap memory, no way to recover */

-- 
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/

Re: D04parameter fails on OSX

[İsmail Dönmez]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

Hi;

On Thu, Apr 12, 2012 at 9:29 PM, Peter Stephenson <
p.w.stephenson@ntlworld.com> wrote:

> On Thu, 12 Apr 2012 16:28:47 +0200
> İsmail Dönmez <ismail@namtrac.org> wrote:
> > ./D04parameter.ztst: starting.
> > *** /tmp/zsh.ztst.out.6163 Thu Apr 12 16:27:14 2012
> > --- /tmp/zsh.ztst.tout.6163 Thu Apr 12 16:27:14 2012
> > ***************
> > *** 3,7 ****
> > --- 3,8 ----
> >   said
> >   i
> >   will
> > + will
> >   and
> >   didJOYCE
> > Test ./D04parameter.ztst failed: output differs from expected as shown
> > above for:
> >   print -l JAMES${(u)${=:-$(echo yes yes she said yes i will yes she said
> > she will and yes she did yes)}}JOYCE
> > Was testing: New hash seive unique algorithm for arrays of more than 10
> > elements
>
> Does this help?
>
> Index: Src/params.c
> ===================================================================
> RCS file: /cvsroot/zsh/zsh/Src/params.c,v
> retrieving revision 1.179
> diff -p -u -r1.179 params.c
> --- Src/params.c        10 Apr 2012 01:17:03 -0000      1.179
> +++ Src/params.c        12 Apr 2012 19:28:33 -0000
> @@ -3532,7 +3532,7 @@ arrayuniq(char **x, int freeok)
>     }
>
>     for (it = x, write_it = x; *it;) {
> -       if (! gethashnode(ht, *it)) {
> +       if (! gethashnode2(ht, *it)) {
>            HashNode new_node = zhalloc(sizeof(struct hashnode));
>            if (!new_node) {
>                /* Oops, out of heap memory, no way to recover */
>

Yes it does, thanks a lot!

ismail