Renode *n;
n = e3(plex);
- if(lex(plex) == LREP) {
+ while(lex(plex) == LREP) {
switch(plex->rune) {
case L'*':
- return node(plex, TSTAR, n, nil);
+ n = node(plex, TSTAR, n, nil);
+ break;
case L'+':
- return node(plex, TPLUS, n, nil);
+ n = node(plex, TPLUS, n, nil);
+ break;
case L'?':
- return node(plex, TQUES, n, nil);
+ n = node(plex, TQUES, n, nil);
+ break;
}
}
plex->peek = 1;
return plex;
}
-static int
-maxthreads(Renode *tree)
-{
- tree = tree->left;
- if(tree->op == TCAT)
- tree = tree->left;
- if(tree->op == TBOL)
- return 2;
- return -1;
-}
-
static Reprog*
regcomp1(char *regstr, int nl, int lit)
{
return nil;
}
- maxthr = regstrlen;
+ maxthr = regstrlen + 1;
parsetr = node(&plex, TSUB, e0(&plex), nil);
// prtree(parsetr, 0, 1);
reprog = malloc(sizeof(Reprog) +
sizeof(Reinst) * plex.instrs +
- sizeof(Rethread) * maxthr +
- sizeof(Rethread*) * maxthr);
+ sizeof(Rethread) * maxthr);
reprog->len = plex.instrs;
reprog->nthr = maxthr;
reprog->startinst = compile(parsetr, reprog, nl);
reprog->threads = (Rethread*)(reprog->startinst + reprog->len);
- reprog->thrpool = (Rethread**)(reprog->threads + reprog->nthr);
reprog->regstr = regstr;
free(plex.nodes);
static Reinst*
compile(Renode *parsetr, Reprog *reprog, int nl)
{
- Reinst *reinst;
+ Reinst *reinst, *end;
int sub;
sub = 0;
reinst = (Reinst*)(reprog+1);
- compile1(parsetr, reinst, &sub, nl);
+ end = compile1(parsetr, reinst, &sub, nl);
+ assert(end <= reinst + reprog->len);
return reinst;
}
{
l->literal = 0;
if(l->done) {
- l->rune = 0;
+ l->rune = L'\0';
return;
}
l->rawexp += chartorune(&l->rune, l->rawexp);
- if(l->rune == L'\\') {
- l->rawexp += chartorune(&l->rune, l->rawexp);
- l->literal = 1;
- }
if(*l->rawexp == 0)
l->done = 1;
- return;
+ if(l->rune == L'\\')
+ getnextrlit(l);
}
static void
l->literal = 1;
if(l->done) {
l->literal = 0;
- l->rune = 0;
+ l->rune = L'\0';
return;
}
l->rawexp += chartorune(&l->rune, l->rawexp);
if(*l->rawexp == 0)
l->done = 1;
- return;
}
static int
if(l->literal)
return l->peeklex = LRUNE;
switch(l->rune){
- case 0:
+ case L'\0':
return l->peeklex = LEND;
case L'*':
case L'?':
static int
pcmp(void *va, void *vb)
{
- vlong n;
Rune *a, *b;
a = va;
b = vb;
- n = (vlong)b[0] - (vlong)a[0];
- if(n)
- return n;
- return (vlong)b[1] - (vlong)a[1];
+ if(a[0] < b[0])
+ return 1;
+ if(a[0] > b[0])
+ return -1;
+ if(a[1] < b[1])
+ return 1;
+ if(a[1] > b[1])
+ return -1;
+ return 0;
}
static void
q[2] = 0;
}
-/* classes are in descending order */
+/* classes are in descending order see pcmp */
static Renode*
buildclassn(Parselex *l)
{