diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Zsh/metafaq.yo | 2 | ||||
| -rw-r--r-- | Src/pattern.c | 10 |
3 files changed, 15 insertions, 3 deletions
@@ -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=$@}". diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo index d8f3dc4cc..4814606fa 100644 --- a/Doc/Zsh/metafaq.yo +++ b/Doc/Zsh/metafaq.yo @@ -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)) diff --git a/Src/pattern.c b/Src/pattern.c index deb094d5f..db5344230 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -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); |