cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plumber: parametrize the number of stored match pattern subexpressions

Browse source
This commit is contained in:
Igor Burago 2022-07-27 16:28:14 +08:00 committed by Dan Cross
parent 0392f49cfc
commit 760cf86705
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/cmd/plumb/match.c
View file

@ -38,11 +38,11 @@ verbis(int obj, Plumbmsg *m, Rule *r)
} }
static void static void
setvar(Resub rs[10], char *match[10]) setvar(Resub rs[NMATCHSUBEXP], char *match[NMATCHSUBEXP])
{ {
int i, n; int i, n;
for(i=0; i<10; i++){ for(i=0; i<NMATCHSUBEXP; i++){
free(match[i]); free(match[i]);
match[i] = nil; match[i] = nil;
if(rs[i].s.sp != nil){ if(rs[i].s.sp != nil){
@ -55,7 +55,7 @@ setvar(Resub rs[10], char *match[10])
} }
int int
clickmatch(Reprog *re, char *text, Resub rs[10], int click) clickmatch(Reprog *re, char *text, Resub rs[NMATCHSUBEXP], int click)
{ {
char *clickp; char *clickp;
int i, w; int i, w;
@ -66,8 +66,8 @@ clickmatch(Reprog *re, char *text, Resub rs[10], int click)
w = chartorune(&r, text+i); w = chartorune(&r, text+i);
clickp = text+i; clickp = text+i;
for(i=0; i<=click; i++){ for(i=0; i<=click; i++){
memset(rs, 0, 10*sizeof(Resub)); memset(rs, 0, NMATCHSUBEXP*sizeof(Resub));
if(regexec(re, text+i, rs, 10)) if(regexec(re, text+i, rs, NMATCHSUBEXP))
if(rs[0].s.sp<=clickp && clickp<=rs[0].e.ep) if(rs[0].s.sp<=clickp && clickp<=rs[0].e.ep)
return 1; return 1;
} }
@ -77,7 +77,7 @@ clickmatch(Reprog *re, char *text, Resub rs[10], int click)
int int
verbmatches(int obj, Plumbmsg *m, Rule *r, Exec *e) verbmatches(int obj, Plumbmsg *m, Rule *r, Exec *e)
{ {
Resub rs[10]; Resub rs[NMATCHSUBEXP];
char *clickval, *alltext; char *clickval, *alltext;
int p0, p1, ntext; int p0, p1, ntext;
@ -122,7 +122,8 @@ verbmatches(int obj, Plumbmsg *m, Rule *r, Exec *e)
/* must match full text */ /* must match full text */
if(ntext < 0) if(ntext < 0)
ntext = strlen(alltext); ntext = strlen(alltext);
if(!regexec(r->regex, alltext, rs, 10) || rs[0].s.sp!=alltext || rs[0].e.ep!=alltext+ntext) if(!regexec(r->regex, alltext, rs, NMATCHSUBEXP)
|| rs[0].s.sp!=alltext || rs[0].e.ep!=alltext+ntext)
break; break;
setvar(rs, e->match); setvar(rs, e->match);
return 1; return 1;
@ -300,7 +301,7 @@ freeexec(Exec *exec)
return; return;
free(exec->dir); free(exec->dir);
free(exec->file); free(exec->file);
for(i=0; i<10; i++) for(i=0; i<NMATCHSUBEXP; i++)
free(exec->match[i]); free(exec->match[i]);
free(exec); free(exec);
} }

7
src/cmd/plumb/plumber.h
View file

@ -52,10 +52,15 @@ struct Ruleset
char *port; char *port;
}; };
enum
{
NMATCHSUBEXP = 10
};
struct Exec struct Exec
{ {
Plumbmsg *msg; Plumbmsg *msg;
char *match[10]; char *match[NMATCHSUBEXP];
int p0; /* begin and end of match */ int p0; /* begin and end of match */
int p1; int p1;
int clearclick; /* click was expanded; remove attribute */ int clearclick; /* click was expanded; remove attribute */