Reject the escape sequences \[uD800] to \[uDFFF] in the parser.

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index cc264eb438b2665a5761a23436cb483c380ab154..40b756a05e1aace8082f9eea83c898abf6e7a148 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl_data.c,v 1.7 2011/01/01 22:27:08 kristaps Exp $ */
+/*     $Id: tbl_data.c,v 1.41 2015/10/06 18:32:20 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,6 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include "config.h"
+
+#include <sys/types.h>
+

 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>


@@ -21,53 +26,76 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "libmandoc.h"
 #include "libroff.h"
 
 #include "libmandoc.h"
 #include "libroff.h"
 

-static void    data(struct tbl *, struct tbl_span *, 
-                       int, const char *, int *);
+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 *);

 
 

-void
-data(struct tbl *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;
        struct tbl_cell *cp;
        int              sv;
 
                int ln, const char *p, int *pos)
 {
        struct tbl_dat  *dat;
        struct tbl_cell *cp;
        int              sv;
 

-       cp = NULL;
-       if (dp->last && dp->last->layout)
-               cp = dp->last->layout->next;
-       else if (NULL == dp->last)
-               cp = dp->layout->first;
-
-       /* Skip over spanners to data formats. */
+       /* Advance to the next layout cell, skipping spanners. */

 
 

-       while (cp && (TBL_CELL_VERT == cp->pos || 
-                               TBL_CELL_DVERT == cp->pos))
+       cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
+       while (cp != NULL && cp->pos == TBL_CELL_SPAN)

                cp = cp->next;
 
                cp = cp->next;
 

-       /* FIXME: warn about losing data contents if cell is HORIZ. */
-
-       dat = mandoc_calloc(1, sizeof(struct tbl_dat));
-       dat->layout = cp;
+       /*
+        * Stop processing when we reach the end of the available layout
+        * cells.  This means that we have extra input.
+        */

 
 

-       if (NULL == dat->layout)
-               TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+       if (cp == NULL) {
+               mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
+                   ln, *pos, p + *pos);
+               /* Skip to the end... */
+               while (p[*pos])
+                       (*pos)++;
+               return;
+       }

 
 

-       if (dp->last) {
+       dat = mandoc_calloc(1, sizeof(*dat));
+       dat->layout = cp;
+       dat->pos = TBL_DATA_NONE;
+       dat->spans = 0;
+       for (cp = cp->next; cp != NULL; cp = cp->next)
+               if (cp->pos == TBL_CELL_SPAN)
+                       dat->spans++;
+               else
+                       break;
+
+       if (dp->last == NULL)
+               dp->first = dat;
+       else

                dp->last->next = dat;
                dp->last->next = dat;

-               dp->last = dat;
-       } else
-               dp->last = dp->first = dat;
+       dp->last = dat;

 
        sv = *pos;
 
        sv = *pos;

-       while (p[*pos] && p[*pos] != tbl->tab)
+       while (p[*pos] && p[*pos] != tbl->opts.tab)

                (*pos)++;
 
                (*pos)++;
 

-       dat->string = mandoc_malloc(*pos - sv + 1);
-       memcpy(dat->string, &p[sv], *pos - sv);
-       dat->string[*pos - sv] = '\0';
+       /*
+        * Check for a continued-data scope opening.  This consists of a
+        * trailing `T{' at the end of the line.  Subsequent lines,
+        * until a standalone `T}', are included in our cell.
+        */
+
+       if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') {
+               tbl->part = TBL_PART_CDATA;
+               return;
+       }
+
+       dat->string = mandoc_strndup(p + sv, *pos - sv);

 
        if (p[*pos])
                (*pos)++;
 
        if (p[*pos])
                (*pos)++;


@@ -82,58 +110,132 @@ data(struct tbl *tbl, struct tbl_span *dp,
                dat->pos = TBL_DATA_NDHORIZ;
        else
                dat->pos = TBL_DATA_DATA;
                dat->pos = TBL_DATA_NDHORIZ;
        else
                dat->pos = TBL_DATA_DATA;

+
+       if ((dat->layout->pos == TBL_CELL_HORIZ ||
+           dat->layout->pos == TBL_CELL_DHORIZ ||
+           dat->layout->pos == TBL_CELL_DOWN) &&
+           dat->pos == TBL_DATA_DATA && *dat->string != '\0')
+               mandoc_msg(MANDOCERR_TBLDATA_SPAN,
+                   tbl->parse, ln, sv, dat->string);

 }
 
 int
 }
 
 int

-tbl_data(struct tbl *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;
+
+       dat = tbl->last_span->last;
+
+       if (p[pos] == 'T' && p[pos + 1] == '}') {
+               pos += 2;
+               if (p[pos] == tbl->opts.tab) {
+                       tbl->part = TBL_PART_DATA;
+                       pos++;
+                       while (p[pos] != '\0')
+                               getdata(tbl, tbl->last_span, ln, p, &pos);
+                       return 1;
+               } else if (p[pos] == '\0') {
+                       tbl->part = TBL_PART_DATA;
+                       return 1;
+               }
+
+               /* Fallthrough: T} is part of a word. */
+       }
+
+       dat->pos = TBL_DATA_DATA;
+
+       if (dat->string != NULL) {
+               sz = strlen(p + pos) + strlen(dat->string) + 2;
+               dat->string = mandoc_realloc(dat->string, sz);
+               (void)strlcat(dat->string, " ", sz);
+               (void)strlcat(dat->string, p + pos, sz);
+       } else
+               dat->string = mandoc_strdup(p + pos);
+
+       if (dat->layout->pos == TBL_CELL_DOWN)
+               mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
+                   ln, pos, dat->string);
+
+       return 0;
+}
+
+static struct tbl_span *
+newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)

 {
        struct tbl_span *dp;
 {
        struct tbl_span *dp;

-       struct tbl_row  *rp;
-       int              pos;

 
 

-       pos = 0;
+       dp = mandoc_calloc(1, sizeof(*dp));
+       dp->line = line;
+       dp->opts = &tbl->opts;
+       dp->layout = rp;
+       dp->prev = tbl->last_span;

 
 

-       if ('\0' == p[pos]) {
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
-               return(0);
-       }
+       if (dp->prev == NULL) {
+               tbl->first_span = dp;
+               tbl->current_span = NULL;
+       } else
+               dp->prev->next = dp;
+       tbl->last_span = dp;
+
+       return dp;
+}

 
 

-       /* 
+void
+tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
+{
+       struct tbl_span *dp;
+       struct tbl_row  *rp;
+
+       /*

         * Choose a layout row: take the one following the last parsed
         * span's.  If that doesn't exist, use the last parsed span's.
         * 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.  This can
-        * be NULL!
+        * If there's no last parsed span, use the first row.  Lastly,
+        * if the last span was a horizontal line, use the same layout
+        * (it doesn't "consume" the layout).

         */
 
         */
 

-       if (tbl->last_span) {
-               assert(tbl->last_span->layout);
-               rp = tbl->last_span->layout->next;
-               if (NULL == rp)
+       if (tbl->last_span != NULL) {
+               if (tbl->last_span->pos == TBL_SPAN_DATA) {
+                       for (rp = tbl->last_span->layout->next;
+                            rp != NULL && rp->first != NULL;
+                            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 (rp == NULL)

                        rp = tbl->last_span->layout;
        } else
                rp = tbl->first_row;
 
                        rp = tbl->last_span->layout;
        } else
                rp = tbl->first_row;
 

-       dp = mandoc_calloc(1, sizeof(struct tbl_span));
-       dp->layout = rp;
+       assert(rp);

 
 

-       if (tbl->last_span) {
-               tbl->last_span->next = dp;
-               tbl->last_span = dp;
-       } else
-               tbl->last_span = tbl->first_span = dp;
+       dp = newspan(tbl, ln, rp);

 
        if ( ! strcmp(p, "_")) {
                dp->pos = TBL_SPAN_HORIZ;
 
        if ( ! strcmp(p, "_")) {
                dp->pos = TBL_SPAN_HORIZ;

-               return(1);
+               return;

        } else if ( ! strcmp(p, "=")) {
                dp->pos = TBL_SPAN_DHORIZ;
        } else if ( ! strcmp(p, "=")) {
                dp->pos = TBL_SPAN_DHORIZ;

-               return(1);
+               return;

        }
 
        dp->pos = TBL_SPAN_DATA;
 
        }
 
        dp->pos = TBL_SPAN_DATA;
 

-       while ('\0' != p[pos])
-               data(tbl, dp, ln, p, &pos);
-
-       return(1);
+       while (p[pos] != '\0')
+               getdata(tbl, dp, ln, p, &pos);

 }
 }