Fix parsing of file names given on the command line; i broke it

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 0d992f16db28f517384632ea169f13793970dad6..b3d651be07ad513db48954238e0b1ec62af362b4 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.7 2010/12/29 14:53:31 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.26 2011/07/25 15:37:00 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 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.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

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


@@ -21,45 +26,11 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "roff.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)
-{
-       struct tbl_row  *rp;
-       struct tbl_cell *cp;
-
-       while (tbl->first) {
-               rp = tbl->first;
-               tbl->first = rp->next;
-               while (rp->first) {
-                       cp = rp->first;
-                       rp->first = cp->next;
-                       free(cp);
-               }
-               free(rp);
-       }
-
-       tbl->last = NULL;
-}
-
-static void
-tbl_init(struct tbl *tbl)
-{
-
-       tbl->part = TBL_PART_OPTS;
-       tbl->tab = '\t';
-       tbl->linesize = 12;
-       tbl->decimal = '.';
-}
-

 enum rofferr
 enum rofferr

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

 {
        int              len;
        const char      *cp;
 {
        int              len;
        const char      *cp;


@@ -85,46 +56,120 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
                return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
        case (TBL_PART_LAYOUT):
                return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
                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_CDATA):
+               return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);

        default:
                break;
        }
        default:
                break;
        }

-       
-       return(ROFF_CONT);
+
+       /*
+        * 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 *
-tbl_alloc(void *data, const mandocmsg msg)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)

 {
 {

-       struct tbl      *p;
-
-       p = mandoc_calloc(1, sizeof(struct tbl));
-       p->data = data;
-       p->msg = msg;
-       tbl_init(p);
+       struct tbl_node *p;
+
+       p = mandoc_calloc(1, sizeof(struct tbl_node));
+       p->line = line;
+       p->pos = pos;
+       p->parse = parse;
+       p->part = TBL_PART_OPTS;
+       p->opts.tab = '\t';
+       p->opts.linesize = 12;
+       p->opts.decimal = '.';

        return(p);
 }
 
 void
        return(p);
 }
 
 void

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

 {
 {

+       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);
+               }
+               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)
+                               free(dp->string);
+                       free(dp);
+               }
+               free(sp);
+       }
+
+       while (NULL != (hp = p->first_head)) {
+               p->first_head = hp->next;
+               free(hp);
+       }

 
 

-       tbl_clear(p);

        free(p);
 }
 
 void
        free(p);
 }
 
 void

-tbl_reset(struct tbl *tbl)
+tbl_restart(int line, int pos, struct tbl_node *tbl)

 {
 {

+       if (TBL_PART_CDATA == tbl->part)
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, 
+                               tbl->line, tbl->pos, NULL);
+
+       tbl->part = TBL_PART_LAYOUT;
+       tbl->line = line;
+       tbl->pos = pos;
+
+       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                               tbl->line, tbl->pos, NULL);
+}

 
 

-       tbl_clear(tbl);
-       tbl_init(tbl);
+const struct tbl_span *
+tbl_span(struct tbl_node *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
 }
 
 void

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

 {
 {

+       struct tbl_node *tbl;

 
 

-       tbl_clear(tbl);
-       tbl->part = TBL_PART_LAYOUT;
+       tbl = *tblp;
+       *tblp = NULL;
+
+       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, 
+                               tbl->line, tbl->pos, NULL);
+
+       if (tbl->last_span)
+               tbl->last_span->flags |= TBL_SPAN_LAST;
+
+       if (TBL_PART_CDATA == tbl->part)
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, 
+                               tbl->line, tbl->pos, NULL);

 }
 
 }