mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-10-02 17:01:19 +02:00
Code

17872: Fix `typeset SECONDS' when creating local parameter

Browse Source
This commit is contained in:
Peter Stephenson 2002-10-29 10:56:38 +00:00
parent 7bfc0f1b5c
commit ff23ebe925
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2002-10-29 Peter Stephenson <pws@csr.com>
* 17872: Src/builtin.c: Make sure `typeset SECONDS' uses a
suitable type when creating a new local parameter.
* 17868: Src/builtin.c, Src/params.c, Doc/Zsh/params.yo:
Can `typeset -F SECONDS' to get better accuracy. Try to
catch all cases when converting or creating local copy

25
Src/builtin.c
View File

@ -1732,11 +1732,30 @@ typeset_single(char *cname, char *pname, Param pm, int func,
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;