diff options
| -rw-r--r-- | libroff.h | 1 | ||||
| -rw-r--r-- | roff.c | 30 | ||||
| -rw-r--r-- | tbl.c | 90 |
3 files changed, 52 insertions, 69 deletions
@@ -101,6 +101,7 @@ struct tbl { struct tbl_row *last_row; struct tbl_span *first_span; struct tbl_span *last_span; + struct tbl *next; }; #define TBL_MSG(tblp, type, line, col) \ @@ -86,7 +86,9 @@ struct roff { struct regset *regs; /* read/writable registers */ struct roffstr *first_string; /* user-defined strings & macros */ const char *current_string; /* value of last called user macro */ - struct tbl *tbl; + struct tbl *first_tbl; /* first table parsed */ + struct tbl *last_tbl; /* last table parsed */ + struct tbl *tbl; /* current table being parsed */ }; struct roffnode { @@ -299,12 +301,16 @@ roffnode_push(struct roff *r, enum rofft tok, const char *name, static void roff_free1(struct roff *r) { + struct tbl *t; - if (r->tbl) { - tbl_free(r->tbl); - r->tbl = NULL; + while (r->first_tbl) { + t = r->first_tbl; + r->first_tbl = t->next; + tbl_free(t); } + r->first_tbl = r->last_tbl = r->tbl = NULL; + while (r->last) roffnode_pop(r); @@ -1117,8 +1123,6 @@ roff_TE(ROFF_ARGS) if (NULL == r->tbl) (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL); - else - tbl_free(r->tbl); r->tbl = NULL; return(ROFF_IGN); @@ -1141,13 +1145,19 @@ roff_T_(ROFF_ARGS) static enum rofferr roff_TS(ROFF_ARGS) { + struct tbl *t; - if (r->tbl) { + if (r->tbl) (*r->msg)(MANDOCERR_SCOPEBROKEN, r->data, ln, ppos, NULL); - tbl_reset(r->tbl); - } else - r->tbl = tbl_alloc(r->data, r->msg); + t = tbl_alloc(r->data, r->msg); + + if (r->last_tbl) + r->last_tbl->next = t; + else + r->first_tbl = r->last_tbl = t; + + r->tbl = r->last_tbl = t; return(ROFF_IGN); } @@ -25,56 +25,6 @@ #include "libmandoc.h" #include "libroff.h" -static void tbl_init(struct tbl *); -static void tbl_clear(struct tbl *); - -static void -tbl_clear(struct tbl *tbl) -{ - struct tbl_row *rp; - struct tbl_cell *cp; - struct tbl_span *sp; - struct tbl_dat *dp; - - while (tbl->first_row) { - rp = tbl->first_row; - tbl->first_row = rp->next; - while (rp->first) { - cp = rp->first; - rp->first = cp->next; - free(cp); - } - free(rp); - } - - tbl->last_row = NULL; - - while (tbl->first_span) { - sp = tbl->first_span; - tbl->first_span = sp->next; - while (sp->first) { - dp = sp->first; - sp->first = dp->next; - if (dp->string) - free(dp->string); - free(dp); - } - free(sp); - } - - tbl->last_span = NULL; -} - -static void -tbl_init(struct tbl *tbl) -{ - - tbl->part = TBL_PART_OPTS; - tbl->tab = '\t'; - tbl->linesize = 12; - tbl->decimal = '.'; -} - enum rofferr tbl_read(struct tbl *tbl, int ln, const char *p, int offs) { @@ -121,24 +71,46 @@ tbl_alloc(void *data, const mandocmsg msg) p = mandoc_calloc(1, sizeof(struct tbl)); p->data = data; p->msg = msg; - tbl_init(p); + p->part = TBL_PART_OPTS; + p->tab = '\t'; + p->linesize = 12; + p->decimal = '.'; return(p); } void tbl_free(struct tbl *p) { + struct tbl_row *rp; + struct tbl_cell *cp; + struct tbl_span *sp; + struct tbl_dat *dp; - tbl_clear(p); - free(p); -} + while (p->first_row) { + rp = p->first_row; + p->first_row = rp->next; + while (rp->first) { + cp = rp->first; + rp->first = cp->next; + free(cp); + } + free(rp); + } -void -tbl_reset(struct tbl *tbl) -{ + while (p->first_span) { + sp = p->first_span; + p->first_span = sp->next; + while (sp->first) { + dp = sp->first; + sp->first = dp->next; + if (dp->string) + free(dp->string); + free(dp); + } + free(sp); + } - tbl_clear(tbl); - tbl_init(tbl); + free(p); } void |