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

Re-add stderr usage 

This commit spiritually reverts 392e05d.

With debug messages and interpreter state sent to stderr and the actual
output of the program sent to stdout, it is easier to read both
independently. For instance, one can redirect stdout or stderr to
another terminal window to keep an eye on both outputs independently:

        bin/modal examples/hello.modal >/dev/pts/5
This commit is contained in:
Sebastian LaVine 2024-04-28 03:15:25 -04:00 committed by Devine Lu Linvega
parent f5cd5d3fa3
commit 42ab70b09d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modal.c
View File

@ -147,7 +147,7 @@ apply_rule(Rule *r, char *s)
while(*s == ' ') s++; while(*s == ' ') s++;
if(*s == ')' && *(dst_ - 1) == ' ') dst_--; if(*s == ')' && *(dst_ - 1) == ' ') dst_--;
} }
if(!quiet && r) printf("%02d %s\n", r->id, src_), ++r->refs; if(!quiet && r) fprintf(stderr, "%02d %s\n", r->id, src_), ++r->refs;
return write_tail(s); return write_tail(s);
} }
@ -198,7 +198,7 @@ rewrite(void)
cap = walk(s), r = find_rule(s, cap); cap = walk(s), r = find_rule(s, cap);
if(r != NULL){ if(r != NULL){
if(!quiet) if(!quiet)
printf(">< (%s) (%s)\n", r->a, r->b); fprintf(stderr, ">< (%s) (%s)\n", r->a, r->b);
r->a = 0; r->a = 0;
} }
while(*cap == ' ') cap++; while(*cap == ' ') cap++;
@ -210,7 +210,7 @@ rewrite(void)
s = parse_frag(&r->b, parse_frag(&r->a, s + 2)); s = parse_frag(&r->b, parse_frag(&r->a, s + 2));
if(*r->a){ if(*r->a){
if(!quiet) if(!quiet)
printf("<> (%s) (%s)\n", r->a, r->b); fprintf(stderr, "<> (%s) (%s)\n", r->a, r->b);
rules_++; rules_++;
} }
while(*s == ' ') s++; while(*s == ' ') s++;
@ -268,14 +268,14 @@ main(int argc, char **argv)
while(*(--w) <= ' ') *w = 0; while(*(--w) <= ' ') *w = 0;
fclose(f); fclose(f);
if(pr != pl) if(pr != pl)
return !printf("Modal program imbalanced.\n"); return !fprintf(stderr, "Modal program imbalanced.\n");
while(rewrite() && ++rw) while(rewrite() && ++rw)
if(!cycles--) return !printf("Modal rewrites exceeded.\n"); if(!cycles--) return !fprintf(stderr, "Modal rewrites exceeded.\n");
if(!quiet) { if(!quiet) {
while(rules_-- > rules) while(rules_-- > rules)
if(!rules_->refs && rules_->a) if(!rules_->refs && rules_->a)
printf("-- Unused rule: %d <> (%s) (%s)\n", rules_->refs, rules_->a, rules_->b); fprintf(stderr, "-- Unused rule: %d <> (%s) (%s)\n", rules_->refs, rules_->a, rules_->b);
printf(".. %s\nCompleted in %d rewrites.\n", src_, rw); fprintf(stderr, ".. %s\nCompleted in %d rewrites.\n", src_, rw);
} }
return 0; return 0;
} }