d6
/
modal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inlined set_reg

This commit is contained in:
Devine Lu Linvega 2024-04-22 09:54:41 -07:00
parent 94d9ecfa72
commit aa0cc80455
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/modal.c
View File

@ -30,21 +30,6 @@ walk(char *s)
return s; return s;
} }
static int
set_reg(int r, char *b)
{
if(regs[r]) {
char *a = regs[r], *aa = walk(a), *bb = walk(b);
while(a < aa || b < bb)
if(*a++ != *b++) return 0;
} else {
regs[r] = b;
if(r < rmin) rmin = r;
if(r > rmax) rmax = r;
}
return 1;
}
static void static void
put_reg(char r, char *reg) put_reg(char r, char *reg)
{ {
@ -96,7 +81,7 @@ static char *
match_rule(Rule *r, char *p) match_rule(Rule *r, char *p)
{ {
int i; int i;
char c, *a = r->a, *b = p; char c, *a = r->a;
if(rmax) { if(rmax) {
for(i = rmin; i <= rmax; i++) for(i = rmin; i <= rmax; i++)
regs[i] = 0; regs[i] = 0;
@ -104,17 +89,27 @@ match_rule(Rule *r, char *p)
} }
while((c = *a)) { while((c = *a)) {
if(c == '?' && !spacer(c)) { if(c == '?' && !spacer(c)) {
if(!set_reg(*(++a), b)) return NULL; int regid = (int)*(++a);
a++, b = walk(b); char *pcap = walk(p), *reg = regs[regid];
if(reg) { /* reg cmp */
char *rcap = walk(reg), *pp = p;
while(reg < rcap || pp < pcap)
if(*reg++ != *pp++) return NULL;
} else { /* reg set */
regs[regid] = p;
if(regid < rmin) rmin = regid;
if(regid > rmax) rmax = regid;
}
a++, p = pcap;
if(!spacer(*a)) if(!spacer(*a))
while((c = *a) && !spacer(c)) a++; while((c = *a) && !spacer(c)) a++;
continue; continue;
} }
if(c != *b) return NULL; if(c != *p) return NULL;
a++, b++; a++, p++;
} }
c = *b; c = *p;
return spacer(c) ? b : NULL; return spacer(c) ? p : NULL;
} }
static int static int
@ -213,7 +208,7 @@ main(int argc, char **argv)
return !printf("usage: modal [-vqn] source.modal\n"); return !printf("usage: modal [-vqn] source.modal\n");
for(i = 1; i < argc && *argv[i] == '-'; i++) { for(i = 1; i < argc && *argv[i] == '-'; i++) {
switch(argv[i][1]) { switch(argv[i][1]) {
case 'v': /* version */ return !printf("Modal Interpreter, 21 Apr 2024.\n"); case 'v': /* version */ return !printf("Modal Interpreter, 22 Apr 2024.\n");
case 'q': /* quiet */ fclose(stderr); break; case 'q': /* quiet */ fclose(stderr); break;
case 'n': /* infinite */ cycles = 0xffffffff; break; case 'n': /* infinite */ cycles = 0xffffffff; break;
} }