1. Eliminate struct eqn, instead use the existing members

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 42e0f0a7be052f1b58df5141229434abae6c8cd4..a5aa5ae5fd662abcdacc58b3fd61e640e15a7a51 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.8 2010/12/29 16:44:23 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.41 2017/06/08 18:11:22 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 <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -21,123 +26,159 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

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

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

-static void             tbl_init(struct tbl *);
-static void             tbl_clear(struct tbl *);

 
 

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

 {
 {

-       struct tbl_row  *rp;
-       struct tbl_cell *cp;
+       const char      *cp;
+       int              active;

 
 

-       while (tbl->first) {
-               rp = tbl->first;
-               tbl->first = rp->next;
-               while (rp->first) {
-                       cp = rp->first;
-                       rp->first = cp->next;
-                       free(cp);
+       /*
+        * 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 == 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;

                }
                }

-               free(rp);
+               if (*cp == ';') {
+                       tbl_option(tbl, ln, p, &pos);
+                       if (p[pos] == '\0')
+                               return ROFF_IGN;
+               }
+       }
+
+       /* Process the other section types.  */
+
+       switch (tbl->part) {
+       case TBL_PART_LAYOUT:
+               tbl_layout(tbl, ln, p, pos);
+               return ROFF_IGN;
+       case TBL_PART_CDATA:
+               return tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN;
+       default:
+               break;

        }
 
        }
 

-       tbl->last = NULL;
+       tbl_data(tbl, ln, p, pos);
+       return ROFF_TBL;

 }
 
 }
 

-static void
-tbl_init(struct tbl *tbl)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)

 {
 {

+       struct tbl_node *tbl;

 
 

+       tbl = mandoc_calloc(1, sizeof(*tbl));
+       tbl->line = line;
+       tbl->pos = pos;
+       tbl->parse = parse;

        tbl->part = TBL_PART_OPTS;
        tbl->part = TBL_PART_OPTS;

-       tbl->tab = '\t';
-       tbl->linesize = 12;
-       tbl->decimal = '.';
+       tbl->opts.tab = '\t';
+       tbl->opts.decimal = '.';
+       return tbl;

 }
 
 }
 

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

 {
 {

-       int              len;
-       const char      *cp;
-       struct tbl_dat  *dp;
+       struct tbl_row  *rp;
+       struct tbl_cell *cp;

        struct tbl_span *sp;
        struct tbl_span *sp;

+       struct tbl_dat  *dp;

 
 

-       cp = &p[offs];
-       len = (int)strlen(cp);
-
-       /*
-        * 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.
-        */
-
-       if (TBL_PART_OPTS == tbl->part && len)
-               if (';' != cp[len - 1])
-                       tbl->part = TBL_PART_LAYOUT;
-
-       /* Now process each logical section of the table.  */
-
-       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):
-               break;
+       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);

        }
 
        }
 

-       /* XXX: throw away data for now. */
-       if (NULL != (sp = tbl_data(tbl, ln, p))) {
-               while (NULL != (dp = sp->first)) {
-                       sp->first = sp->first->next;
-                       if (dp->string)
-                               free(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);
                }
                free(sp);
        }
                        free(dp);
                }
                free(sp);
        }

-       
-       return(ROFF_CONT);
-}
-
-struct tbl *
-tbl_alloc(void *data, const mandocmsg msg)
-{
-       struct tbl      *p;

 
 

-       p = mandoc_calloc(1, sizeof(struct tbl));
-       p->data = data;
-       p->msg = msg;
-       tbl_init(p);
-       return(p);
+       free(tbl);

 }
 
 void
 }
 
 void

-tbl_free(struct tbl *p)
+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&");

 
 

-       tbl_clear(p);
-       free(p);
+       tbl->part = TBL_PART_LAYOUT;
+       tbl->line = line;
+       tbl->pos = pos;

 }
 
 }
 

-void
-tbl_reset(struct tbl *tbl)
+const struct tbl_span *
+tbl_span(struct tbl_node *tbl)

 {
 {

-
-       tbl_clear(tbl);
-       tbl_init(tbl);
+       struct tbl_span  *span;
+
+       assert(tbl);
+       span = tbl->current_span ? tbl->current_span->next
+                                : tbl->first_span;
+       if (span)
+               tbl->current_span = span;
+       return span;

 }
 
 }
 

-void
-tbl_restart(struct tbl *tbl)
+int
+tbl_end(struct tbl_node **tblp)

 {
 {

-
-       tbl_clear(tbl);
-       tbl->part = TBL_PART_LAYOUT;
+       struct tbl_node *tbl;
+       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");
+
+       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;
+       }
+       return 1;

 }
 }

-