From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21365 invoked from network); 14 Jan 2002 13:04:46 -0000 Received: from sunsite.dk (130.225.247.90) by ns1.primenet.com.au with SMTP; 14 Jan 2002 13:04:46 -0000 Received: (qmail 1691 invoked by alias); 14 Jan 2002 13:04:39 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 16448 Received: (qmail 1678 invoked from network); 14 Jan 2002 13:04:39 -0000 To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: Re: PATCH: += parameter assignments In-reply-to: "=?iso-8859-1?q?Oliver=20Kiddle?="'s message of "Mon, 14 Jan 2002 12:45:25 GMT." <20020114124525.3912.qmail@web9301.mail.yahoo.com> Date: Mon, 14 Jan 2002 13:04:11 +0000 Message-ID: <20091.1011013451@csr.com> From: Peter Stephenson Oliver wrote: > > And the following can't be anything but a bug: > > A bug maybe, but it has bugger all to do with the += code. > > > (Previously > > meaning 4.0.4 but 4.1.0-dev-1 behaves as now so the problem will have > been introduced sometime before that. 15292 at a guess as that is the > one in that time frame dealing with math.c. pop() can now retrieve variables, so we need to check for errors when it does. Index: Src/math.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/math.c,v retrieving revision 1.11 diff -u -r1.11 math.c --- Src/math.c 2001/07/08 00:30:43 1.11 +++ Src/math.c 2002/01/14 13:02:22 @@ -497,7 +497,7 @@ if (mv->val.type == MN_UNSET && !noget) mv->val = getnparam(mv->lval); sp--; - return mv->val; + return errflag ? zero_mnumber : mv->val; } /**/ @@ -630,6 +630,8 @@ DPUTS(sp < 1, "BUG: math: not enough wallabies in outback."); b = pop(0); a = pop(what == EQ); + if (errflag) + return; if (tp & (OP_A2IO|OP_E2IO)) { /* coerce to integers */ @@ -856,6 +858,8 @@ c = pop(0); b = pop(0); a = pop(0); + if (errflag) + return; /* b and c can stay different types in this case. */ push(((a.type & MN_FLOAT) ? a.u.d : a.u.l) ? b : c, NULL, 0); break; -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 392070 ********************************************************************** The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer. **********************************************************************