Simplify the code building lists of spans, no output change intended.

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index e22dffd5b37060722f8ec7016f36ccf5857565e2..036a117752c25cf2bc67c8007774f180274021d8 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.19 2011/01/02 20:34:05 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.46 2018/12/14 06:33:14 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,299 +15,169 @@
  * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"

 #include "mandoc.h"
 #include "mandoc.h"

-#include "roff.h"
+#include "tbl.h"

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

-#include "libroff.h"
+#include "tbl_parse.h"
+#include "tbl_int.h"

 
 

-static void     tbl_calc(struct tbl_node *);
-static void     tbl_calc_data(struct tbl_node *, struct tbl_dat *);
-static void     tbl_calc_data_literal(struct tbl_dat *);
-static void     tbl_calc_data_number(struct tbl_node *, struct tbl_dat *);
-static void     tbl_calc_data_spanner(struct tbl_dat *);

 
 

-enum rofferr
-tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
+void
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)

 {
 {

-       int              len;

        const char      *cp;
        const char      *cp;

-
-       cp = &p[offs];
-       len = (int)strlen(cp);
+       int              active;

 
        /*
 
        /*

-        * If we're in the options section and we don't have a
-        * terminating semicolon, assume we've moved directly into the
-        * layout section.  No need to report a warning: this is,
-        * apparently, standard behaviour.
+        * In the options section, proceed to the layout section
+        * after a semicolon, or right away if there is no semicolon.
+        * Ignore semicolons in arguments.

         */
 
         */
 

-       if (TBL_PART_OPTS == tbl->part && len)
-               if (';' != cp[len - 1])
-                       tbl->part = TBL_PART_LAYOUT;
+       if (tbl->part == TBL_PART_OPTS) {
+               tbl->part = TBL_PART_LAYOUT;
+               active = 1;
+               for (cp = p + pos; *cp != '\0'; cp++) {
+                       switch (*cp) {
+                       case '(':
+                               active = 0;
+                               continue;
+                       case ')':
+                               active = 1;
+                               continue;
+                       case ';':
+                               if (active)
+                                       break;
+                               continue;
+                       default:
+                               continue;
+                       }
+                       break;
+               }
+               if (*cp == ';') {
+                       tbl_option(tbl, ln, p, &pos);
+                       if (p[pos] == '\0')
+                               return;
+               }
+       }

 
 

-       /* Now process each logical section of the table.  */
+       /* Process the other section types.  */

 
        switch (tbl->part) {
 
        switch (tbl->part) {

-       case (TBL_PART_OPTS):
-               return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
-       case (TBL_PART_LAYOUT):
-               return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
-       case (TBL_PART_DATA):
+       case TBL_PART_LAYOUT:
+               tbl_layout(tbl, ln, p, pos);
+               break;
+       case TBL_PART_CDATA:
+               tbl_cdata(tbl, ln, p, pos);
+               break;
+       default:
+               tbl_data(tbl, ln, p, pos);

                break;
        }
                break;
        }

-
-       /*
-        * This only returns zero if the line is empty, so we ignore it
-        * and continue on.
-        */
-       return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);

 }
 
 struct tbl_node *
 }
 
 struct tbl_node *

-tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
+tbl_alloc(int pos, int line, struct tbl_node *last_tbl)

 {
 {

-       struct tbl_node *p;
+       struct tbl_node *tbl;

 
 

-       p = mandoc_calloc(1, sizeof(struct tbl_node));
-       p->line = line;
-       p->pos = pos;
-       p->data = data;
-       p->msg = msg;
-       p->part = TBL_PART_OPTS;
-       p->opts.tab = '\t';
-       p->opts.linesize = 12;
-       p->opts.decimal = '.';
-       return(p);
+       tbl = mandoc_calloc(1, sizeof(*tbl));
+       if (last_tbl != NULL)
+               last_tbl->next = tbl;
+       tbl->line = line;
+       tbl->pos = pos;
+       tbl->part = TBL_PART_OPTS;
+       tbl->opts.tab = '\t';
+       tbl->opts.decimal = '.';
+       return tbl;

 }
 
 void
 }
 
 void

-tbl_free(struct tbl_node *p)
+tbl_free(struct tbl_node *tbl)

 {
 {

+       struct tbl_node *old_tbl;

        struct tbl_row  *rp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;
        struct tbl_row  *rp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;

-       struct tbl_head *hp;

 
 

-       while (NULL != (rp = p->first_row)) {
-               p->first_row = rp->next;
-               while (rp->first) {
-                       cp = rp->first;
-                       rp->first = cp->next;
-                       free(cp);
+       while (tbl != NULL) {
+               while ((rp = tbl->first_row) != NULL) {
+                       tbl->first_row = rp->next;
+                       while (rp->first != NULL) {
+                               cp = rp->first;
+                               rp->first = cp->next;
+                               free(cp->wstr);
+                               free(cp);
+                       }
+                       free(rp);

                }
                }

-               free(rp);
-       }
-
-       while (NULL != (sp = p->first_span)) {
-               p->first_span = sp->next;
-               while (sp->first) {
-                       dp = sp->first;
-                       sp->first = dp->next;
-                       if (dp->string)
+               while ((sp = tbl->first_span) != NULL) {
+                       tbl->first_span = sp->next;
+                       while (sp->first != NULL) {
+                               dp = sp->first;
+                               sp->first = dp->next;

                                free(dp->string);
                                free(dp->string);

-                       free(dp);
+                               free(dp);
+                       }
+                       free(sp);

                }
                }

-               free(sp);
-       }
-
-       while (NULL != (hp = p->first_head)) {
-               p->first_head = hp->next;
-               free(hp);
+               old_tbl = tbl;
+               tbl = tbl->next;
+               free(old_tbl);

        }
        }

-
-       free(p);

 }
 
 void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
 }
 
 void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {

+       if (tbl->part == TBL_PART_CDATA)
+               mandoc_msg(MANDOCERR_TBLDATA_BLK, line, pos, "T&");

 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
        tbl->pos = pos;
 
        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_node *tbl)
-{
-
-       assert(tbl);
-       return(tbl->last_span);
-}
-
-void
-tbl_end(struct tbl_node *tbl)
-{
-
-       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
-       else
-               tbl_calc(tbl);
-
-       if (tbl->last_span)
-               tbl->last_span->flags |= TBL_SPAN_LAST;
-}
-
-static void
-tbl_calc(struct tbl_node *tbl)
-{
-       struct tbl_span *sp;
-       struct tbl_dat  *dp;
-       struct tbl_head *hp;
-
-       /* Calculate width as the max of column cells' widths. */
-
-       for (sp = tbl->first_span; sp; sp = sp->next) {
-               switch (sp->pos) {
-               case (TBL_DATA_HORIZ):
-                       /* FALLTHROUGH */
-               case (TBL_DATA_DHORIZ):
-                       continue;
-               default:
-                       break;
-               }
-               for (dp = sp->first; dp; dp = dp->next)
-                       tbl_calc_data(tbl, dp);
-       }
-
-       /* Calculate width as the simple spanner value. */
-
-       for (hp = tbl->first_head; hp; hp = hp->next) 
-               switch (hp->pos) {
-               case (TBL_HEAD_VERT):
-                       hp->width = 1;
-                       break;
-               case (TBL_HEAD_DVERT):
-                       hp->width = 2;
-                       break;
-               default:
-                       break;
-               }
-}
-
-static void
-tbl_calc_data(struct tbl_node *tbl, struct tbl_dat *data)
-{
-
-       if (NULL == data->layout)
-               return;
-
-       /* Branch down into data sub-types. */
-
-       switch (data->layout->pos) {
-       case (TBL_CELL_HORIZ):
-               /* FALLTHROUGH */
-       case (TBL_CELL_DHORIZ):
-               tbl_calc_data_spanner(data);
-               break;
-       case (TBL_CELL_LONG):
-               /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
-               /* FALLTHROUGH */
-       case (TBL_CELL_LEFT):
-               /* FALLTHROUGH */
-       case (TBL_CELL_RIGHT):
-               tbl_calc_data_literal(data);
-               break;
-       case (TBL_CELL_NUMBER):
-               tbl_calc_data_number(tbl, data);
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-}
-
-static void
-tbl_calc_data_spanner(struct tbl_dat *data)
-{
-
-       /* N.B., these are horiz spanners (not vert) so always 1. */
-       data->layout->head->width = 1;

 }
 
 }
 

-static void
-tbl_calc_data_number(struct tbl_node *tbl, struct tbl_dat *data)
+struct tbl_span *
+tbl_span(struct tbl_node *tbl)

 {
 {

-       int              sz, d;
-       char            *dp, pnt;
-
-       /*
-        * First calculate number width and decimal place (last + 1 for
-        * no-decimal numbers).  If the stored decimal is subsequent
-        * ours, make our size longer by that difference
-        * (right-"shifting"); similarly, if ours is subsequent the
-        * stored, then extend the stored size by the difference.
-        * Finally, re-assign the stored values.
-        */
-
-       /* TODO: use spacing modifier. */
-
-       assert(data->string);
-       sz = (int)strlen(data->string);
-       pnt = tbl->opts.decimal;
-
-       if (NULL == (dp = strchr(data->string, pnt)))
-               d = sz + 1;
-       else
-               d = (int)(dp - data->string) + 1;
-
-       sz += 2;
+       struct tbl_span  *span;

 
 

-       if (data->layout->head->decimal > d) {
-               sz += data->layout->head->decimal - d;
-               d = data->layout->head->decimal;
-       } else
-               data->layout->head->width += 
-                       d - data->layout->head->decimal;
-
-       if (sz > data->layout->head->width)
-               data->layout->head->width = sz;
-       if (d > data->layout->head->decimal)
-               data->layout->head->decimal = d;
+       span = tbl->current_span ? tbl->current_span->next
+                                : tbl->first_span;
+       if (span != NULL)
+               tbl->current_span = span;
+       return span;

 }
 
 }
 

-static void
-tbl_calc_data_literal(struct tbl_dat *data)
+int
+tbl_end(struct tbl_node *tbl, int still_open)

 {
 {

-       int              sz, bufsz;
-
-       /* 
-        * Calculate our width and use the spacing, with a minimum
-        * spacing dictated by position (centre, e.g,. gets a space on
-        * either side, while right/left get a single adjacent space).
-        */
-
-       assert(data->string);
-       sz = (int)strlen(data->string);
-
-       switch (data->layout->pos) {
-       case (TBL_CELL_LONG):
-               /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
-               bufsz = 2;
-               break;
-       default:
-               bufsz = 1;
-               break;
+       struct tbl_span *sp;
+
+       if (still_open)
+               mandoc_msg(MANDOCERR_BLK_NOEND, tbl->line, tbl->pos, "TS");
+       else if (tbl->part == TBL_PART_CDATA)
+               mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->line, tbl->pos, "TE");
+
+       sp = tbl->first_span;
+       while (sp != NULL && sp->first == NULL)
+               sp = sp->next;
+       if (sp == NULL) {
+               mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->line, tbl->pos, NULL);
+               return 0;

        }
        }

-
-       if (data->layout->spacing)
-               bufsz = bufsz > data->layout->spacing ? 
-                       bufsz : data->layout->spacing;
-
-       sz += bufsz;
-       if (data->layout->head->width < sz)
-               data->layout->head->width = sz;
+       return 1;

 }
 }