system/zsh
system/zsh
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh synced 2024-07-25 04:04:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

?## fix from 13497 and site name change from Geoff

Browse source
This commit is contained in:
Peter Stephenson 2001-02-18 00:58:07 +00:00
parent af2ae90d25
commit 441648bf5d
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2001-02-17 Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
* unposted: Doc/Zsh/metafaq.yo: site name change from Geoff.
* 13497: Src/pattern.c: `?##' didn't work.
2001-02-16 Bart Schaefer <schaefer@zsh.org>
* 13495: Follow-up to 13492 to un-break "${(A)=foo=$@}".

2
Doc/Zsh/metafaq.yo
View file

@ -42,7 +42,7 @@ item(Finland)(
nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
)
item(France)(
nofill(tt(ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/))
nofill(tt(ftp://ftp.cenatls.cena.dgac.fr/shells/zsh/))
)
item(Germany)(
nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/) em((H))

10
Src/pattern.c
View file

@ -1103,13 +1103,19 @@ patcomppiece(int *flagp)
* each time we fail on a non-empty branch, we try the empty branch,
* which is equivalent to backtracking.
*/
if ((flags & P_SIMPLE) && op == P_ONEHASH &&
if ((flags & P_SIMPLE) && (op == P_ONEHASH || op == P_TWOHASH) &&
P_OP((Upat)patout+starter) == P_ANY) {
/* Optimize ?# to *. Silly thing to do, since who would use
* use ?# ? But it makes the later code shorter.
*/
Upat uptr = (Upat)patout + starter;
uptr->l = (uptr->l & ~0xff) | P_STAR;
if (op == P_TWOHASH) {
/* ?## becomes ?* */
uptr->l = (uptr->l & ~0xff) | P_ANY;
pattail(starter, patnode(P_STAR));
} else {
uptr->l = (uptr->l & ~0xff) | P_STAR;
}
} else if ((flags & P_SIMPLE) && op && !(patglobflags & 0xff)) {
/* Don't simplify if we need to look for approximations. */
patinsert(op, starter, NULL, 0);