* Re: pws-20: problems with "$@"
1999-06-04 11:52 pws-20: problems with "$@" Andrej Borsenkow
@ 1999-06-04 11:56 ` Peter Stephenson
1999-06-04 12:43 ` Andrej Borsenkow
0 siblings, 1 reply; 3+ messages in thread
From: Peter Stephenson @ 1999-06-04 11:56 UTC (permalink / raw)
To: ZSH workers mailing list
"Andrej Borsenkow" wrote:
> This worked for me under all ZSH versions:
>
> bor@itsrm2:/opt%> which cd
> cd () {
> builtin cd "$@" > /dev/null
> }
>
> But now I get:
>
> bor@itsrm2:~/src%> cd
> bor@itsrm2:~/src%> /bin/pwd
> /home/bor/src
> bor@itsrm2:~/src%> builtin cd
> bor@itsrm2:~%> /bin/pwd
> /home/bor
I don't know if this is the problem, which I can't reproduce, but I realise
my last patch for removing quotes around names of parameters should only
apply in braces, otherwise the final " in expressions like the one above
gets skipped too early.
Looking at this, I discovered that nested substitutions don't actually need
braces. For example,
% print $(echo \~)
~
% print $~$(echo \~)
/home/user2/pws
--- a nested substitution with globsubst turned on. I guess this is
unintentional, and it's confusing, so the patch stops this. Or does
somebody know better?
--- Src/subst.c.noqt Wed Jun 2 09:54:59 1999
+++ Src/subst.c Fri Jun 4 13:53:27 1999
@@ -976,7 +976,7 @@
zerr("bad substitution", NULL, 0);
return NULL;
}
- } else if (INULL(*s))
+ } else if (inbrace && INULL(*s))
s++;
else
break;
@@ -984,7 +984,7 @@
globsubst = globsubst && !qt;
idbeg = s;
- if ((subexp = (s[-1] && isstring(*s) &&
+ if ((subexp = (inbrace && s[-1] && isstring(*s) &&
(s[1] == Inbrace || s[1] == Inpar)))) {
int sav;
int quoted = *s == Qstring;
@@ -1168,8 +1168,9 @@
}
idend = s;
- while (INULL(*s))
- s++;
+ if (inbrace)
+ while (INULL(*s))
+ s++;
if ((colf = *s == ':'))
s++;
--
Peter Stephenson <pws@ibmth.df.unipi.it> Tel: +39 050 844536
WWW: http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy
^ permalink raw reply [flat|nested] 3+ messages in thread