From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18435 invoked by alias); 23 Oct 2013 21:05:46 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31877 Received: (qmail 14289 invoked from network); 23 Oct 2013 21:05:31 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-type:content-transfer-encoding; bh=a5a4476dmZE2KOS8Y8Yo2C7/6cwaIdL5B2UZIV5DwCk=; b=ZR/epme96yF1KUNxkz0wkRyNICsqzxgX8PjouCTgBovlq3U4iw2Zh9tTepNK0DC8fq fi9qs3QYiRItKlFlo1sQwU5MoqFO3ZRtVSPI/Q2Re3l5jh2tAN7eyIBltfNpWdTajAkY t+CigDXRVBLziArzOCvjk436iuKGOhj5Iy+XBLxwVzHMTpXVlvf5c+RznfTTDjOYqJNQ qq8MhBLhp61ELOwHDWkGOUW9uFIdKISpoeJbcfMi6gvyWoJQM5mh5lKvmJPln2Fg+0nF YGeK1csBE46nfTQcEwwAUqUMoBdsgDJ6Nit9WoB/uu1tjGT1dfaljPBl51qFou7nBMcn oqvw== X-Gm-Message-State: ALoCoQmcN2x5CFYYjgvPHbq1TVAWDxnzO36TrzYQD+AZW0j5sYmxxTHSiCGstVKyOunjvIrFz+2e X-Received: by 10.14.179.130 with SMTP id h2mr6787eem.148.1382562328356; Wed, 23 Oct 2013 14:05:28 -0700 (PDT) X-ProxyUser-IP: 86.6.157.246 Date: Wed, 23 Oct 2013 22:05:26 +0100 From: Peter Stephenson To: Zsh Hackers' List Subject: PATCH: disabling pattern groups Message-ID: <20131023220526.36682868@pws-pc.ntlworld.com> X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.7; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit I'm well aware it's high time for another release, and the main thing blocking it is getting pattern disables properly tested. Goodness knows why I let parentheses and related ksh-style groups be disabled, it just seemed consistent. The main reason to have this feature at all is so people complaining about "^" being a pattern character, or "~" if they're Emacs-backup-with-version-number fanatics, can disable those and still use extendedglob, so I could probably have got away without. However, now I've done it, disabling groups should work with some degree of consistency without breaking anything else. Anyway, this seems to get the basics and some of the not-so-basics working: disable -p '(' [[ "(foo)" = (foo) ]] succeeds setopt kshglob disable -p '@(' [[ "@(foo)" = @(foo) ]] fails unless either "(" is disabled, or SH_GLOB is set, in which case it succeeds --- subtle but correct: we've always allowed the mix of zsh and ksh pattern styles and while it may be morally questionable I'm not going to change that here. setopt kshglob disable -p '(' '@(' '|' [[ "@(foo|bar)" = @(foo|bar) ]] succeeds. Next, I'll start constructing some tests. diff --git a/Src/pattern.c b/Src/pattern.c index 609a9e3..c86f86d 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -748,7 +748,7 @@ patcompswitch(int paren, int *flagp) starter = 0; br = patnode(P_BRANCH); - if (!patcompbranch(&flags)) + if (!patcompbranch(&flags, paren)) return 0; if (patglobflags != (int)savglobflags) gfchanged++; @@ -839,7 +839,7 @@ patcompswitch(int paren, int *flagp) patglobflags = (int)savglobflags; } } - newbr = patcompbranch(&flags); + newbr = patcompbranch(&flags, paren); if (tilde == 2) { /* restore special treatment of / */ zpc_special[ZPC_SLASH] = '/'; @@ -902,7 +902,7 @@ patcompswitch(int paren, int *flagp) /**/ static long -patcompbranch(int *flagp) +patcompbranch(int *flagp, int paren) { long chain, latest = 0, starter; int flags = 0; @@ -973,7 +973,7 @@ patcompbranch(int *flagp) patparse++; latest = patcompnot(0, &flags); } else - latest = patcomppiece(&flags); + latest = patcomppiece(&flags, paren); if (!latest) return 0; if (!starter) @@ -1221,7 +1221,7 @@ pattern_range_to_string(char *rangestr, char *outstr) /**/ static long -patcomppiece(int *flagp) +patcomppiece(int *flagp, int paren) { long starter = 0, next, op, opnd; int flags, flags2, kshchar, len, ch, patch, nmeta; @@ -1253,17 +1253,25 @@ patcomppiece(int *flagp) } /* - * End of string (or no string at all) if ksh-type parentheses, - * or special character, unless that character is a tilde and - * the character following is an end-of-segment character. Thus - * tildes are not special if there is nothing following to - * be excluded. + * If '(' is disabled as a pattern char, allow ')' as + * an ordinary string character if there are no parentheses to + * close. Don't allow it otherwise, it changes the syntax. */ - if (kshchar || (memchr(zpc_special, *patparse, ZPC_COUNT) && - (*patparse != zpc_special[ZPC_TILDE] || - patparse[1] == '/' || - !memchr(zpc_special, patparse[1], ZPC_SEG_COUNT)))) - break; + if (zpc_special[ZPC_INPAR] != Marker || *patparse != Outpar || + paren) { + /* + * End of string (or no string at all) if ksh-type parentheses, + * or special character, unless that character is a tilde and + * the character following is an end-of-segment character. Thus + * tildes are not special if there is nothing following to + * be excluded. + */ + if (kshchar || (memchr(zpc_special, *patparse, ZPC_COUNT) && + (*patparse != zpc_special[ZPC_TILDE] || + patparse[1] == '/' || + !memchr(zpc_special, patparse[1], ZPC_SEG_COUNT)))) + break; + } /* Remember the previous character for backtracking */ patprev = patparse; @@ -1438,7 +1446,7 @@ patcomppiece(int *flagp) patadd(NULL, 0, 1, 0); break; case Inpar: - DPUTS(zpc_special[ZPC_INPAR] == Marker, + DPUTS(!kshchar && zpc_special[ZPC_INPAR] == Marker, "Treating '(' as pattern character although disabled"); DPUTS(isset(SHGLOB) && !kshchar, "Treating bare '(' as pattern character with SHGLOB"); @@ -1523,7 +1531,7 @@ patcomppiece(int *flagp) * Marker for restoring a backslash in output: * does not match a character. */ - next = patcomppiece(flagp); + next = patcomppiece(flagp, paren); /* * Can't match a pure string since we need to do this * as multiple chunks. @@ -1710,7 +1718,7 @@ patcompnot(int paren, int *flagsp) pattail(starter, excl = patnode(P_EXCLUDE)); up.p = NULL; patadd((char *)&up, 0, sizeof(up), 0); - if (!(br = (paren ? patcompswitch(1, &dummy) : patcompbranch(&dummy)))) + if (!(br = (paren ? patcompswitch(1, &dummy) : patcompbranch(&dummy, 0)))) return 0; pattail(br, patnode(P_EXCEND)); n = patnode(P_NOTHING); /* just so much easier */ -- Peter Stephenson Web page now at http://homepage.ntlworld.com/p.w.stephenson/