pedroediaz/lexvm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

count splits in rep too

Browse Source
This commit is contained in:
Kyryl Melekhin
2021-10-15 21:31:01 +00:00
parent 3c384b905e
commit 09526c0c55
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pike.c
View File

@@ -92,7 +92,6 @@ typedef struct rsub rsub;
struct rsub struct rsub
{ {
int ref; int ref;
rsub *freesub;
const char *sub[]; const char *sub[];
}; };
@@ -311,19 +310,22 @@ static int _compilecode(const char **re_loc, rcode *prog, int sizecode)
PC += size; PC += size;
} }
if (code) { if (code) {
mincnt = 0;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
switch (code[term+i]) { switch (code[term+i]) {
case SPLIT:
case RSPLIT:
mincnt++;
case CLASS: case CLASS:
i += code[term+i+2] * 2 + 1; i += code[term+i+2] * 2 + 1;
case JMP: case JMP:
case SPLIT:
case RSPLIT:
case SAVE: case SAVE:
case CHAR: case CHAR:
i++; i++;
case ANY: case ANY:
icnt++; icnt++;
} }
prog->splits += mincnt * icnt;
prog->len += (maxcnt-1) * icnt; prog->len += (maxcnt-1) * icnt;
} }
break; break;
@@ -445,13 +447,13 @@ int re_comp(rcode *prog, const char *re, int nsubs)
#define newsub(init, copy) \ #define newsub(init, copy) \
if (freesub) \ if (freesub) \
{ s1 = freesub; freesub = s1->freesub; copy } \ { s1 = freesub; freesub = (rsub*)s1->sub[0]; copy } \
else \ else \
{ s1 = (rsub*)&nsubs[suboff+=rsubsize]; init } \ { s1 = (rsub*)&nsubs[suboff+=rsubsize]; init } \
#define decref(csub) \ #define decref(csub) \
if (--csub->ref == 0) { \ if (--csub->ref == 0) { \
csub->freesub = freesub; \ csub->sub[0] = (char*)freesub; \
freesub = csub; \ freesub = csub; \
} \ } \