=================================================================== RCS file: /cvs/mandoc/tbl_data.c,v retrieving revision 1.20 retrieving revision 1.36 diff -u -p -r1.20 -r1.36 --- mandoc/tbl_data.c 2011/01/25 12:16:22 1.20 +++ mandoc/tbl_data.c 2015/01/28 17:32:07 1.36 @@ -1,7 +1,7 @@ -/* $Id: tbl_data.c,v 1.20 2011/01/25 12:16:22 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.36 2015/01/28 17:32:07 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011 Ingo Schwarze + * Copyright (c) 2011, 2015 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 @@ -15,10 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif +#include + #include #include #include @@ -26,16 +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 struct tbl_span *newspan(struct tbl_node *, struct tbl_row *); +static void 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, +static void +getdata(struct tbl_node *tbl, struct tbl_span *dp, int ln, const char *p, int *pos) { struct tbl_dat *dat; @@ -48,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; /* @@ -64,11 +64,12 @@ data(struct tbl_node *tbl, struct tbl_span *dp, */ if (NULL == cp) { - TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); + mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, + ln, *pos, p + *pos); /* Skip to the end... */ while (p[*pos]) (*pos)++; - return(1); + return; } dat = mandoc_calloc(1, sizeof(struct tbl_dat)); @@ -82,7 +83,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp, spans++; else break; - + dat->spans = spans; if (dp->last) { @@ -103,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; } - 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]) @@ -125,24 +128,21 @@ 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_TBLDATA_SPAN, + tbl->parse, ln, sv, dat->string); - return(1); + return; } -/* ARGSUSED */ int -tbl_cdata(struct tbl_node *tbl, int ln, const char *p) +tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_dat *dat; - size_t sz; - int pos; + size_t sz; - pos = 0; - dat = tbl->last_span->last; if (p[pos] == 'T' && p[pos + 1] == '}') { @@ -150,7 +150,8 @@ 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)); + getdata(tbl, tbl->last_span, ln, p, &pos); + return(1); } else if ('\0' == p[pos]) { tbl->part = TBL_PART_DATA; return(1); @@ -162,55 +163,50 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p) dat->pos = TBL_DATA_DATA; if (dat->string) { - sz = strlen(p) + strlen(dat->string) + 2; + sz = strlen(p + pos) + strlen(dat->string) + 2; dat->string = mandoc_realloc(dat->string, sz); - strlcat(dat->string, " ", sz); - strlcat(dat->string, p, sz); + (void)strlcat(dat->string, " ", sz); + (void)strlcat(dat->string, p + pos, sz); } else - dat->string = mandoc_strdup(p); + dat->string = mandoc_strdup(p + pos); - if (TBL_CELL_DOWN == dat->layout->pos) - TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos); + if (TBL_CELL_DOWN == dat->layout->pos) + mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, + ln, pos, dat->string); return(0); } static struct tbl_span * -newspan(struct tbl_node *tbl, struct tbl_row *rp) +newspan(struct tbl_node *tbl, int line, struct tbl_row *rp) { struct tbl_span *dp; dp = mandoc_calloc(1, sizeof(struct tbl_span)); - dp->tbl = &tbl->opts; + dp->line = line; + dp->opts = &tbl->opts; dp->layout = rp; dp->head = tbl->first_head; + dp->prev = tbl->last_span; - if (tbl->last_span) { - tbl->last_span->next = dp; - tbl->last_span = dp; - } else { - tbl->last_span = tbl->first_span = dp; + if (dp->prev == NULL) { + tbl->first_span = dp; + tbl->current_span = NULL; dp->flags |= TBL_SPAN_FIRST; - } + } else + dp->prev->next = dp; + tbl->last_span = dp; return(dp); } -int -tbl_data(struct tbl_node *tbl, int ln, const char *p) +void +tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_span *dp; struct tbl_row *rp; - int pos; - pos = 0; - - if ('\0' == p[pos]) { - TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); - 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, @@ -224,12 +220,12 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) for (rp = tbl->last_span->layout->next; rp && rp->first; rp = rp->next) { switch (rp->first->pos) { - case (TBL_CELL_HORIZ): - dp = newspan(tbl, rp); + case TBL_CELL_HORIZ: + dp = newspan(tbl, ln, rp); dp->pos = TBL_SPAN_HORIZ; continue; - case (TBL_CELL_DHORIZ): - dp = newspan(tbl, rp); + case TBL_CELL_DHORIZ: + dp = newspan(tbl, ln, rp); dp->pos = TBL_SPAN_DHORIZ; continue; default: @@ -247,23 +243,18 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) assert(rp); - dp = newspan(tbl, rp); + dp = newspan(tbl, ln, rp); if ( ! strcmp(p, "_")) { dp->pos = TBL_SPAN_HORIZ; - return(1); + return; } else if ( ! strcmp(p, "=")) { dp->pos = TBL_SPAN_DHORIZ; - return(1); + return; } dp->pos = TBL_SPAN_DATA; - /* This returns 0 when TBL_PART_CDATA is entered. */ - while ('\0' != p[pos]) - if ( ! data(tbl, dp, ln, p, &pos)) - return(0); - - return(1); + getdata(tbl, dp, ln, p, &pos); }