mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 13:01:28 +02:00
Code Releases Activity

15242: pcre_match -a and $match instead of pparams

Browse source
This commit is contained in:
Clint Adams 2001-07-04 15:13:33 +00:00
parent b79484dc40
commit b65dcc197b
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2001-07-03 Clint Adams <clint@zsh.org> 2001-07-03 Clint Adams <clint@zsh.org>
* 15242: Doc/Zsh/mod_pcre.yo,
Src/Modules/pcre.c: set $match
instead of pparams. pcre_match -a
sets specified array instead of $match.
* 15234: Doc/Zsh/mod_pcre.yo: describe * 15234: Doc/Zsh/mod_pcre.yo: describe
behavior introduced by 15228. behavior introduced by 15228.

7
Doc/Zsh/mod_pcre.yo
View file

@ -15,12 +15,13 @@ Studies the previously-compiled PCRE which may result in faster
matching. matching.
) )
findex(pcre_match) findex(pcre_match)
item(tt(pcre_match) var(string))( item(tt(pcre_match) [ tt(-a) var(arr) ] var(string))(
Returns successfully if tt(string) matches the previously-compiled Returns successfully if tt(string) matches the previously-compiled
PCRE. PCRE.
If the expression captures substrings within parentheses, If the expression captures substrings within parentheses,
tt(pcre_match) will set the positional parameters to tt(pcre_match) will set the array var($match) to those
those substrings, starting with $1 for the first. substrings, unless the tt(-a) option is given, in which
case it will set the array var(arr).
) )
enditem() enditem()

19
Src/Modules/pcre.c
View file

@ -90,7 +90,15 @@ static int
bin_pcre_match(char *nam, char **args, char *ops, int func) bin_pcre_match(char *nam, char **args, char *ops, int func)
{ {
int ret, capcount, *ovec, ovecsize; int ret, capcount, *ovec, ovecsize;
char **captures; char **captures, **matches, *receptacle = NULL;
if(ops['a']) {
receptacle = *args++;
if(!*args) {
zwarnnam(nam, "not enough arguments", NULL, 0);
return 1;
}
}
if (pcre_fullinfo(pcre_pattern, pcre_hints, PCRE_INFO_CAPTURECOUNT, &capcount)) if (pcre_fullinfo(pcre_pattern, pcre_hints, PCRE_INFO_CAPTURECOUNT, &capcount))
{ {
@ -108,8 +116,11 @@ bin_pcre_match(char *nam, char **args, char *ops, int func)
else if (ret>0) { else if (ret>0) {
if(!pcre_get_substring_list(*args, ovec, ret, (const char ***)&captures)) { if(!pcre_get_substring_list(*args, ovec, ret, (const char ***)&captures)) {
freearray(pparams); matches = zarrdup(&captures[1]); /* first one would be entire string */
pparams = zarrdup(&captures[1]); /* first one would be entire string */ if (receptacle == NULL)
setaparam("match", matches);
else
setaparam(receptacle, matches);
pcre_free_substring_list((const char **)captures); pcre_free_substring_list((const char **)captures);
return 0; return 0;
@ -128,7 +139,7 @@ static struct builtin bintab[] = {
#ifdef HAVE_PCRE_STUDY #ifdef HAVE_PCRE_STUDY
BUILTIN("pcre_study", 0, bin_pcre_study, 0, 0, 0, NULL, NULL), BUILTIN("pcre_study", 0, bin_pcre_study, 0, 0, 0, NULL, NULL),
#endif #endif
BUILTIN("pcre_match", 0, bin_pcre_match, 1, 1, 0, NULL, NULL) BUILTIN("pcre_match", 0, bin_pcre_match, 1, 2, 0, "a", NULL)
}; };
/**/ /**/