=================================================================== RCS file: /cvs/mandoc/tbl_data.c,v retrieving revision 1.19 retrieving revision 1.30 diff -u -p -r1.19 -r1.30 --- mandoc/tbl_data.c 2011/01/11 14:12:01 1.19 +++ mandoc/tbl_data.c 2014/04/20 16:46:05 1.30 @@ -1,6 +1,7 @@ -/* $Id: tbl_data.c,v 1.19 2011/01/11 14:12:01 kristaps Exp $ */ +/* $Id: tbl_data.c,v 1.30 2014/04/20 16:46:05 schwarze Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2011 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -25,14 +26,18 @@ #include #include "mandoc.h" +#include "mandoc_aux.h" #include "libmandoc.h" #include "libroff.h" -static int data(struct tbl_node *, struct tbl_span *, - int, const char *, int *); +static int getdata(struct tbl_node *, struct tbl_span *, + int, const char *, int *); +static struct tbl_span *newspan(struct tbl_node *, int, + struct tbl_row *); + static int -data(struct tbl_node *tbl, struct tbl_span *dp, +getdata(struct tbl_node *tbl, struct tbl_span *dp, int ln, const char *p, int *pos) { struct tbl_dat *dat; @@ -45,14 +50,12 @@ data(struct tbl_node *tbl, struct tbl_span *dp, else if (NULL == dp->last) cp = dp->layout->first; - /* - * Skip over spanners and vertical lines to data formats, since + /* + * Skip over spanners, since * we want to match data with data layout cells in the header. */ - while (cp && (TBL_CELL_VERT == cp->pos || - TBL_CELL_DVERT == cp->pos || - TBL_CELL_SPAN == cp->pos)) + while (cp && TBL_CELL_SPAN == cp->pos) cp = cp->next; /* @@ -61,7 +64,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp, */ if (NULL == cp) { - TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); + mandoc_msg(MANDOCERR_TBLEXTRADAT, tbl->parse, + ln, *pos, NULL); /* Skip to the end... */ while (p[*pos]) (*pos)++; @@ -79,7 +83,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp, spans++; else break; - + dat->spans = spans; if (dp->last) { @@ -100,11 +104,13 @@ data(struct tbl_node *tbl, struct tbl_span *dp, if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) { tbl->part = TBL_PART_CDATA; - return(0); + return(1); } - dat->string = mandoc_malloc(*pos - sv + 1); - memcpy(dat->string, &p[sv], *pos - sv); + assert(*pos - sv >= 0); + + dat->string = mandoc_malloc((size_t)(*pos - sv + 1)); + memcpy(dat->string, &p[sv], (size_t)(*pos - sv)); dat->string[*pos - sv] = '\0'; if (p[*pos]) @@ -122,20 +128,20 @@ data(struct tbl_node *tbl, struct tbl_span *dp, dat->pos = TBL_DATA_DATA; if (TBL_CELL_HORIZ == dat->layout->pos || - TBL_CELL_DHORIZ == dat->layout->pos || - TBL_CELL_DOWN == dat->layout->pos) + TBL_CELL_DHORIZ == dat->layout->pos || + TBL_CELL_DOWN == dat->layout->pos) if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) - TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); + mandoc_msg(MANDOCERR_TBLIGNDATA, + tbl->parse, ln, sv, NULL); return(1); } -/* ARGSUSED */ int tbl_cdata(struct tbl_node *tbl, int ln, const char *p) { struct tbl_dat *dat; - size_t sz; + size_t sz; int pos; pos = 0; @@ -147,7 +153,7 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p) if (p[pos] == tbl->opts.tab) { tbl->part = TBL_PART_DATA; pos++; - return(data(tbl, tbl->last_span, ln, p, &pos)); + return(getdata(tbl, tbl->last_span, ln, p, &pos)); } else if ('\0' == p[pos]) { tbl->part = TBL_PART_DATA; return(1); @@ -166,12 +172,36 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p) } else dat->string = mandoc_strdup(p); - if (TBL_CELL_DOWN == dat->layout->pos) - TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos); + if (TBL_CELL_DOWN == dat->layout->pos) + mandoc_msg(MANDOCERR_TBLIGNDATA, tbl->parse, + ln, pos, NULL); return(0); } +static struct tbl_span * +newspan(struct tbl_node *tbl, int line, struct tbl_row *rp) +{ + struct tbl_span *dp; + + dp = mandoc_calloc(1, sizeof(struct tbl_span)); + dp->line = line; + dp->opts = &tbl->opts; + dp->layout = rp; + dp->head = tbl->first_head; + + if (tbl->last_span) { + tbl->last_span->next = dp; + tbl->last_span = dp; + } else { + tbl->last_span = tbl->first_span = dp; + tbl->current_span = NULL; + dp->flags |= TBL_SPAN_FIRST; + } + + return(dp); +} + int tbl_data(struct tbl_node *tbl, int ln, const char *p) { @@ -182,11 +212,11 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) pos = 0; if ('\0' == p[pos]) { - TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); + mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL); return(0); } - /* + /* * Choose a layout row: take the one following the last parsed * span's. If that doesn't exist, use the last parsed span's. * If there's no last parsed span, use the first row. Lastly, @@ -196,9 +226,24 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) if (tbl->last_span) { assert(tbl->last_span->layout); - if (tbl->last_span->pos == TBL_SPAN_DATA) - rp = tbl->last_span->layout->next; - else + if (tbl->last_span->pos == TBL_SPAN_DATA) { + for (rp = tbl->last_span->layout->next; + rp && rp->first; rp = rp->next) { + switch (rp->first->pos) { + case TBL_CELL_HORIZ: + dp = newspan(tbl, ln, rp); + dp->pos = TBL_SPAN_HORIZ; + continue; + case TBL_CELL_DHORIZ: + dp = newspan(tbl, ln, rp); + dp->pos = TBL_SPAN_DHORIZ; + continue; + default: + break; + } + break; + } + } else rp = tbl->last_span->layout; if (NULL == rp) @@ -208,19 +253,8 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) assert(rp); - dp = mandoc_calloc(1, sizeof(struct tbl_span)); - dp->tbl = &tbl->opts; - dp->layout = rp; - dp->head = tbl->first_head; + dp = newspan(tbl, ln, rp); - if (tbl->last_span) { - tbl->last_span->next = dp; - tbl->last_span = dp; - } else { - tbl->last_span = tbl->first_span = dp; - dp->flags |= TBL_SPAN_FIRST; - } - if ( ! strcmp(p, "_")) { dp->pos = TBL_SPAN_HORIZ; return(1); @@ -234,7 +268,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) /* This returns 0 when TBL_PART_CDATA is entered. */ while ('\0' != p[pos]) - if ( ! data(tbl, dp, ln, p, &pos)) + if ( ! getdata(tbl, dp, ln, p, &pos)) return(0); return(1);