From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17310 invoked from network); 29 Oct 2002 10:41:18 -0000 Received: from sunsite.dk (130.225.247.90) by ns1.primenet.com.au with SMTP; 29 Oct 2002 10:41:18 -0000 Received: (qmail 27441 invoked by alias); 29 Oct 2002 10:41:02 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 17872 Received: (qmail 27392 invoked from network); 29 Oct 2002 10:40:54 -0000 To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: Re: PATCH: SECONDS can be floating point In-reply-to: "Peter Stephenson"'s message of "Mon, 28 Oct 2002 18:55:52 GMT." <22634.1035831352@csr.com> Date: Tue, 29 Oct 2002 10:40:25 +0000 Message-ID: <23260.1035888025@csr.com> From: Peter Stephenson Peter Stephenson wrote: > This allows typeset to switch the SECONDS special parameter between > integer and floating point. Committed, but the following extra patch is necessary for checking that typesets that create a local copy have a suitable type. Index: Src/builtin.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/builtin.c,v retrieving revision 1.88 diff -u -r1.88 builtin.c --- Src/builtin.c 29 Oct 2002 10:31:16 -0000 1.88 +++ Src/builtin.c 29 Oct 2002 10:39:27 -0000 @@ -1732,11 +1732,30 @@ int err = 1; if (!readonly && !strcmp(pname, "SECONDS")) { + /* + * We allow SECONDS to change type between integer + * and floating point. If we are creating a new + * local copy we check the type here and allow + * a new special to be created with that type. + * We then need to make sure the correct type + * for the special is restored at the end of the scope. + * If we are changing the type of an existing + * parameter, we do the whole thing here. + */ if (newspecial != NS_NONE) { - newspecial = NS_SECONDS; - err = 0; /* and continue */ - tc = 0; /* but don't do a normal conversion */ + /* + * The first test allows `typeset' to copy the + * existing type. This is the usual behaviour + * for making special parameters local. + */ + if (PM_TYPE(on) == 0 || PM_TYPE(on) == PM_INTEGER || + PM_TYPE(on) == PM_FFLOAT || PM_TYPE(on) == PM_EFLOAT) + { + newspecial = NS_SECONDS; + err = 0; /* and continue */ + tc = 0; /* but don't do a normal conversion */ + } } else if (!setsecondstype(pm, on, off)) { if (value && !setsparam(pname, ztrdup(value))) return NULL; -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** 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. **********************************************************************