1 files changed, 18 insertions, 21 deletions

diff --git a/src/prc1/td.c b/src/prc1/td.c
index 72c379f..06572e7 100644
--- a/src/prc1/td.c
+++ b/src/prc1/td.c
@@ -1,4 +1,5 @@
 #include "td.h"
+#include "dbg.h"
 #include "div.h"
 #include "errloc.h"
 #include "fn.h"
@@ -76,17 +77,16 @@ static int bump(const struct tk *tk, const struct type *t, struct prv *p)
     tdc->neg = neg;
 
     for (size_t i = 0; i < p->block; i++)
-        fputc('\t', stderr);
+        dbg("\t");
 
-    fprintf(stderr, "\t\tnext %s constant value set to ",
-        neg ? "negative" : "positive");
+    dbg("\t\tnext %s constant value set to ", neg ? "negative" : "positive");
 
     if (neg)
-        fprintf(stderr, "%lld", tdc->u.v);
+        dbg("%lld", tdc->u.v);
     else
-        fprintf(stderr, "%llu", tdc->u.uv);
+        dbg("%llu", tdc->u.uv);
 
-    fputc('\n', stderr);
+    dbg("\n");
     return 0;
 }
 
@@ -160,10 +160,9 @@ static int cid(const struct lex *l, struct prv *p)
         return -1;
 
     for (size_t i = 0; i < p->block; i++)
-        fputc('\t', stderr);
+        dbg("\t");
 
-    fprintf(stderr, "\tadding constant %s to %s (%lld)\n", id->s, v->s,
-        t->u.c.v);
+    dbg("\tadding constant %s to %s (%lld)\n", id->s, v->s, t->u.c.v);
     reset(p);
     return 1;
 }
@@ -232,9 +231,9 @@ static int cnum(const struct lex *l, struct prv *p)
     tdc->neg = sign;
 
     for (size_t i = 0; i < p->block; i++)
-        fputc('\t', stderr);
+        dbg("\t");
 
-    fprintf(stderr, "\tadding constant %s to %s\n", id->s, num->s);
+    dbg("\tadding constant %s to %s\n", id->s, num->s);
 
     if (bump(id, nt, p))
         return -1;
@@ -291,16 +290,16 @@ static int c(const struct lex *l, struct prv *p)
         nt->u.c.uv = tdc->u.uv;
 
     for (size_t i = 0; i < p->block; i++)
-        fputc('\t', stderr);
+        dbg("\t");
 
-    fprintf(stderr, "\tadding constant %s to ", id->s);
+    dbg("\tadding constant %s to ", id->s);
 
     if (tdc->neg)
-        fprintf(stderr, "%lld", tdc->u.v);
+        dbg("%lld", tdc->u.v);
     else
-        fprintf(stderr, "%llu", tdc->u.uv);
+        dbg("%llu", tdc->u.uv);
 
-    fputc('\n', stderr);
+    dbg("\n", stderr);
 
     if (bump(id, &td->types[td->ntypes++], p))
         return -1;
@@ -341,7 +340,7 @@ static int p(const struct lex *l, struct prv *p)
 
     td->types = types;
     p->proto = pt;
-    fprintf(stderr, "\tadding prototype %s\n", p->stk->s);
+    dbg("\tadding prototype %s\n", p->stk->s);
     return div_p(l, p);
 
 failure:
@@ -365,8 +364,7 @@ static int ends(struct type *t)
     t->align = st->entries->t->align;
     t->sz = e->offset + e->t->sz;
     t->sz += t->align - (t->sz % t->align);
-    fprintf(stderr, "\tadding struct %s, size %zu, align %zu\n", t->tk->s,
-        t->sz, t->align);
+    dbg("\tadding struct %s, size %zu, align %zu\n", t->tk->s, t->sz, t->align);
     return 0;
 }
 
@@ -514,8 +512,7 @@ static int tt(const struct lex *l, struct prv *p, const struct type *t)
         .u.t.alias = t
     };
 
-    fprintf(stderr, "\tadding %s (%d:%d) alias %s\n", id->s, loc->line,
-        loc->col, s);
+    dbg("\tadding %s (%d:%d) alias %s\n", id->s, loc->line, loc->col, s);
     reset(p);
     p->id = NULL;
     ret = 1;