The files mandoc.c and mandoc.h contained both specialised low-level

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index e21db3235f6ebee34eed60c32df6ecc736ae5ea7..dfb85bd27cdac7c5147be61bebd5d48ab3c6af7c 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.21 2011/01/25 12:24:27 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.29 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,16 +26,17 @@
 #include <time.h>
 
 #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 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;
@@ -49,13 +50,11 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                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,7 +63,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)++;
@@ -103,11 +103,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])
@@ -128,7 +130,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                        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);
 }
@@ -150,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);
@@ -170,18 +173,20 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
                dat->string = mandoc_strdup(p);
 
        if (TBL_CELL_DOWN == dat->layout->pos) 
-               TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos);
+               mandoc_msg(MANDOCERR_TBLIGNDATA, 
+                               tbl->parse, ln, pos, NULL);
 
        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;
 
@@ -207,7 +212,7 @@ 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);
        }
 
@@ -226,11 +231,11 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
                                        rp && rp->first; rp = rp->next) {
                                switch (rp->first->pos) {
                                case (TBL_CELL_HORIZ):
-                                       dp = newspan(tbl, rp);
+                                       dp = newspan(tbl, ln, rp);
                                        dp->pos = TBL_SPAN_HORIZ;
                                        continue;
                                case (TBL_CELL_DHORIZ):
-                                       dp = newspan(tbl, rp);
+                                       dp = newspan(tbl, ln, rp);
                                        dp->pos = TBL_SPAN_DHORIZ;
                                        continue;
                                default:
@@ -248,7 +253,7 @@ 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;
@@ -263,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);