version 1.10, 2010/12/31 14:52:41 |
version 1.15, 2011/01/01 22:19:15 |
Line 56 tbl_read(struct tbl *tbl, int ln, const char *p, int o |
|
Line 56 tbl_read(struct tbl *tbl, int ln, const char *p, int o |
|
break; |
break; |
} |
} |
|
|
/* |
/* |
* FIXME: allow the original string to slip through for the time |
* This only returns zero if the line is empty, so we ignore it |
* being. |
* and continue on. |
*/ |
*/ |
return(tbl_data(tbl, ln, p) ? ROFF_CONT : ROFF_ERR); |
return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); |
} |
} |
|
|
struct tbl * |
struct tbl * |
tbl_alloc(void *data, const mandocmsg msg) |
tbl_alloc(int pos, int line, void *data, const mandocmsg msg) |
{ |
{ |
struct tbl *p; |
struct tbl *p; |
|
|
p = mandoc_calloc(1, sizeof(struct tbl)); |
p = mandoc_calloc(1, sizeof(struct tbl)); |
|
p->line = line; |
|
p->pos = pos; |
p->data = data; |
p->data = data; |
p->msg = msg; |
p->msg = msg; |
p->part = TBL_PART_OPTS; |
p->part = TBL_PART_OPTS; |
Line 85 tbl_free(struct tbl *p) |
|
Line 87 tbl_free(struct tbl *p) |
|
struct tbl_cell *cp; |
struct tbl_cell *cp; |
struct tbl_span *sp; |
struct tbl_span *sp; |
struct tbl_dat *dp; |
struct tbl_dat *dp; |
|
struct tbl_head *hp; |
|
|
while (p->first_row) { |
while (NULL != (rp = p->first_row)) { |
rp = p->first_row; |
|
p->first_row = rp->next; |
p->first_row = rp->next; |
while (rp->first) { |
while (rp->first) { |
cp = rp->first; |
cp = rp->first; |
Line 97 tbl_free(struct tbl *p) |
|
Line 99 tbl_free(struct tbl *p) |
|
free(rp); |
free(rp); |
} |
} |
|
|
while (p->first_span) { |
while (NULL != (sp = p->first_span)) { |
sp = p->first_span; |
|
p->first_span = sp->next; |
p->first_span = sp->next; |
while (sp->first) { |
while (sp->first) { |
dp = sp->first; |
dp = sp->first; |
Line 110 tbl_free(struct tbl *p) |
|
Line 111 tbl_free(struct tbl *p) |
|
free(sp); |
free(sp); |
} |
} |
|
|
|
while (NULL != (hp = p->first_head)) { |
|
p->first_head = hp->next; |
|
free(hp); |
|
} |
|
|
free(p); |
free(p); |
} |
} |
|
|
void |
void |
tbl_restart(struct tbl *tbl) |
tbl_restart(int line, int pos, struct tbl *tbl) |
{ |
{ |
|
|
tbl->part = TBL_PART_LAYOUT; |
tbl->part = TBL_PART_LAYOUT; |
|
tbl->line = line; |
|
tbl->pos = pos; |
|
|
|
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
|
TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); |
|
} |
|
|
|
const struct tbl_span * |
|
tbl_span(const struct tbl *tbl) |
|
{ |
|
|
|
assert(tbl); |
|
return(tbl->last_span); |
|
} |
|
|
|
void |
|
tbl_end(struct tbl *tbl) |
|
{ |
|
|
|
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
|
TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); |
} |
} |
|
|