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

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 00ee4661254b49b00ef3de7f515a0a144fa90e08..036a117752c25cf2bc67c8007774f180274021d8 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.39 2015/01/30 17:32:16 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.46 2018/12/14 06:33:14 schwarze Exp $ */

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


@@ -25,13 +25,15 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

+#include "mandoc.h"
+#include "tbl.h"

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

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

 
 
 
 

-enum rofferr
+void

 tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
        const char      *cp;
 tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
        const char      *cp;


@@ -66,7 +68,7 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
                if (*cp == ';') {
                        tbl_option(tbl, ln, p, &pos);
                        if (p[pos] == '\0')
                if (*cp == ';') {
                        tbl_option(tbl, ln, p, &pos);
                        if (p[pos] == '\0')

-                               return(ROFF_IGN);
+                               return;

                }
        }
 
                }
        }
 


@@ -75,109 +77,107 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
        switch (tbl->part) {
        case TBL_PART_LAYOUT:
                tbl_layout(tbl, ln, p, pos);
        switch (tbl->part) {
        case TBL_PART_LAYOUT:
                tbl_layout(tbl, ln, p, pos);

-               return(ROFF_IGN);
+               break;

        case TBL_PART_CDATA:
        case TBL_PART_CDATA:

-               return(tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN);
+               tbl_cdata(tbl, ln, p, pos);
+               break;

        default:
        default:

+               tbl_data(tbl, ln, p, pos);

                break;
        }
                break;
        }

-
-       tbl_data(tbl, ln, p, pos);
-       return(ROFF_TBL);

 }
 
 struct tbl_node *
 }
 
 struct tbl_node *

-tbl_alloc(int pos, int line, struct mparse *parse)
+tbl_alloc(int pos, int line, struct tbl_node *last_tbl)

 {
        struct tbl_node *tbl;
 
        tbl = mandoc_calloc(1, sizeof(*tbl));
 {
        struct tbl_node *tbl;
 
        tbl = mandoc_calloc(1, sizeof(*tbl));

+       if (last_tbl != NULL)
+               last_tbl->next = tbl;

        tbl->line = line;
        tbl->pos = pos;
        tbl->line = line;
        tbl->pos = pos;

-       tbl->parse = parse;

        tbl->part = TBL_PART_OPTS;
        tbl->opts.tab = '\t';
        tbl->opts.decimal = '.';
        tbl->part = TBL_PART_OPTS;
        tbl->opts.tab = '\t';
        tbl->opts.decimal = '.';

-       return(tbl);
+       return tbl;

 }
 
 void
 tbl_free(struct tbl_node *tbl)
 {
 }
 
 void
 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;
 

-       while ((rp = tbl->first_row) != NULL) {
-               tbl->first_row = rp->next;
-               while (rp->first != NULL) {
-                       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 ((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);
+               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);
+                       }
+                       free(sp);

                }
                }

-               free(sp);
+               old_tbl = tbl;
+               tbl = tbl->next;
+               free(old_tbl);

        }
        }

-
-       free(tbl);

 }
 
 void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
        if (tbl->part == TBL_PART_CDATA)
 }
 
 void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
        if (tbl->part == TBL_PART_CDATA)

-               mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
-                   line, pos, "T&");
+               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;
 }
 

-const struct tbl_span *
+struct tbl_span *

 tbl_span(struct tbl_node *tbl)
 {
        struct tbl_span  *span;
 
 tbl_span(struct tbl_node *tbl)
 {
        struct tbl_span  *span;
 

-       assert(tbl);

        span = tbl->current_span ? tbl->current_span->next
                                 : tbl->first_span;
        span = tbl->current_span ? tbl->current_span->next
                                 : tbl->first_span;

-       if (span)
+       if (span != NULL)

                tbl->current_span = span;
                tbl->current_span = span;

-       return(span);
+       return span;

 }
 
 int
 }
 
 int

-tbl_end(struct tbl_node **tblp)
+tbl_end(struct tbl_node *tbl, int still_open)

 {
 {

-       struct tbl_node *tbl;

        struct tbl_span *sp;
 
        struct tbl_span *sp;
 

-       tbl = *tblp;
-       *tblp = NULL;
-
-       if (tbl->part == TBL_PART_CDATA)
-               mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
-                   tbl->line, tbl->pos, "TE");
+       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) {
 
        sp = tbl->first_span;
        while (sp != NULL && sp->first == NULL)
                sp = sp->next;
        if (sp == NULL) {

-               mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->parse,
-                   tbl->line, tbl->pos, NULL);
-               return(0);
+               mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->line, tbl->pos, NULL);
+               return 0;

        }
        }

-       return(1);
+       return 1;

 }
 }