From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 112 invoked by alias); 20 Jul 2014 16:55:45 -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: 32891 Received: (qmail 24919 invoked from network); 20 Jul 2014 16:55:44 -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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 From: Bart Schaefer Message-id: <140720095545.ZM20143@torch.brasslantern.com> Date: Sun, 20 Jul 2014 09:55:45 -0700 In-reply-to: <20140720102409.GS11492@isis.sigpipe.cz> Comments: In reply to Roman Neuhauser "Re: Several PCRE module oddities" (Jul 20, 12:24pm) References: <20140719121937.GN12213@bunkus.org> <20140719123158.GO12213@bunkus.org> <20140719123620.GP12213@bunkus.org> <20140719123645.GQ12213@bunkus.org> <140719152116.ZM13686@torch.brasslantern.com> <20140720102409.GS11492@isis.sigpipe.cz> X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh-workers@zsh.org, Roman Neuhauser Subject: [PATCH] Re: Several PCRE module oddities MIME-version: 1.0 Content-type: text/plain; charset=us-ascii [Redirected from zsh-users] On Jul 20, 12:24pm, Roman Neuhauser wrote: } Subject: Re: Several PCRE module oddities } } maybe the slightly shorter version? } } > - if (offset_start < 0 || offset_start >= (subject_len ? subject_len : 1)) I was thinking more of using offset_start < 0 as a flag for whether the -n option appears at all, since the return value of getposint() can be independently examined. Here's a new patch, making CASE_MATCH apply only to the =~ operator, and removing dead code (the "not enough arguments" test is done by the generic builtin command handler and lacked a failure return in bin_pcre_match). diff --git a/Doc/Zsh/mod_pcre.yo b/Doc/Zsh/mod_pcre.yo index 6ab5a19..faada28 100644 --- a/Doc/Zsh/mod_pcre.yo +++ b/Doc/Zsh/mod_pcre.yo @@ -80,6 +80,14 @@ Matches a string against a perl-compatible regular expression. For example, -[[ "$text" -pcre-match ^d+$ ]] && print text variable contains only "d's". +example([[ "$text" -pcre-match ^d+$ ]] && +print text variable contains only "d's".) + +pindex(REMATCH_PCRE) +pindex(NO_CASE_MATCH) +If the tt(REMATCH_PCRE) option is set, the tt(=~) operator is equivalent to +tt(-pcre-match), and the tt(NO_CASE_MATCH) option may be used. Note that +tt(NO_CASE_MATCH) never applies to the tt(pcre_match) builtin, instead use +the tt(-i) switch of tt(pcre_compile). ) enditem() diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c index cb9f8ef..0e43ab7 100644 --- a/Src/Modules/pcre.c +++ b/Src/Modules/pcre.c @@ -274,7 +274,7 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func)) int return_value = 1; /* The subject length and offset start are both int values in pcre_exec */ int subject_len; - int offset_start = 0; + int offset_start = -1; int want_offset_pair = 0; if (pcre_pattern == NULL) { @@ -289,14 +289,11 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func)) matched_portion = OPT_ARG(ops,c); } if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */ - offset_start = getposint(OPT_ARG(ops,c), nam); + if ((offset_start = getposint(OPT_ARG(ops,c), nam) < 0)) + return 1; } /* For the entire match, 'Return' the offset byte positions instead of the matched string */ if(OPT_ISSET(ops,'b')) want_offset_pair = 1; - - if(!*args) { - zwarnnam(nam, "not enough arguments"); - } if ((ret = pcre_fullinfo(pcre_pattern, pcre_hints, PCRE_INFO_CAPTURECOUNT, &capcount))) { @@ -311,7 +308,7 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func)) unmetafy(plaintext, NULL); subject_len = (int)strlen(plaintext); - if (offset_start < 0 || offset_start >= subject_len) + if (offset_start > 0 && offset_start >= subject_len) ret = PCRE_ERROR_NOMATCH; else ret = pcre_exec(pcre_pattern, pcre_hints, plaintext, subject_len, offset_start, 0, ovec, ovecsize); @@ -345,6 +342,8 @@ cond_pcre_match(char **a, int id) if (zpcre_utf8_enabled()) pcre_opts |= PCRE_UTF8; + if (isset(REMATCHPCRE) && !isset(CASEMATCH)) + pcre_opts |= PCRE_CASELESS; lhstr = cond_str(a,0,0); rhre = cond_str(a,1,0);