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

Housekeeping

This commit is contained in:
Devine Lu Linvega 2024-04-27 21:12:14 -07:00
parent 93326ecf73
commit 481e2b56cf
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/tests.modal
View File

@ -97,6 +97,7 @@ reverse (modal) = ladom (reverse 1) test
(incomplete-basic) = () (incomplete 1) test
(incomplete-reg abcdef) = () (incomplete 2) test
(?(?x) incomplete-lambda) = () (incomplete 3) test
(?() abc) = (abc) (incomplete 4) test
?(?-) (Inline rules)

53
src/modal.c
View File

@ -152,21 +152,16 @@ apply_rule(Rule *r, char *s)
}
static char *
parse_frag(Rule *r, int side, char *src)
parse_frag(char **side, char *src)
{
int wrapped;
char c, *cap;
if(side)
r->b = ∅
else
r->a = ∅
while((c = *src) && c == ' ') src++;
if(c == ')' || (c == '<' && src[1] == '>')) return src;
if(side)
r->b = dict_;
else
r->a = dict_;
cap = walk(src), wrapped = c == '(';
if(c == ')' || (c == '<' && src[1] == '>')) {
*side = &empty;
return src;
}
*side = dict_, cap = walk(src), wrapped = c == '(';
if(wrapped) src++, cap--;
while(src < cap) c = *src, *dict_++ = *src++;
src += wrapped, *dict_++ = 0;
@ -185,7 +180,7 @@ find_rule(char *s, char *cap)
if(!*a && ss == cap) return r;
r++;
}
return r;
return NULL;
}
static int
@ -196,34 +191,36 @@ rewrite(void)
while((c = *s)) {
if(c == '(' || spacer(last)) {
Rule *r = NULL;
/* phase: define */
if(c == '<' && s[1] == '>') {
r = rules_, r->id = rules_ - rules - 1;
s = parse_frag(r, 1, parse_frag(r, 0, s + 2));
if(*r->a) {
if(!quiet && r->a)
printf("<> (%s) (%s)\n", r->a, r->b);
while(*s == ' ') s++;
rules_++;
}
return write_tail(s);
}
/* phase: undefine */
if(c == '>' && s[1] == '<') {
s += 2;
while(*s == ' ') s++;
cap = walk(s), r = find_rule(s, cap);
if(!quiet && r->a)
printf(">< (%s) (%s)\n", r->a, r->b);
r->a = 0;
if(r != NULL){
if(!quiet && r->a)
printf(">< (%s) (%s)\n", r->a, r->b);
r->a = 0;
}
while(*cap == ' ') cap++;
return write_tail(cap);
}
/* phase: define */
if(c == '<' && s[1] == '>') {
r = rules_, r->id = rules_ - rules - 1;
s = parse_frag(&r->b, parse_frag(&r->a, s + 2));
if(*r->a){
if(!quiet)
printf("<> (%s) (%s)\n", r->a, r->b);
rules_++;
}
while(*s == ' ') s++;
return write_tail(s);
}
/* phase: lambda */
if(c == '?' && s[1] == '(') {
cap = walk(s + 1);
r = &lambda, r->id = -1;
parse_frag(r, 1, parse_frag(r, 0, s + 2));
parse_frag(&r->b, parse_frag(&r->a, s + 2));
s = cap;
while(*s == ' ') s++;
if(!apply_rule(&lambda, s)) write_tail(s);