prevent the skipvsp flag from creeping past actual text

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index bd8fc99cdb7f29082d52d237f4826800b588321f..00ee4661254b49b00ef3de7f515a0a144fa90e08 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.34 2015/01/27 05:21:45 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.39 2015/01/30 17:32:16 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>


@@ -32,7 +32,7 @@
 
 
 enum rofferr
 
 
 enum rofferr

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

 {
        const char      *cp;
        int              active;
 {
        const char      *cp;
        int              active;


@@ -46,7 +46,7 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
        if (tbl->part == TBL_PART_OPTS) {
                tbl->part = TBL_PART_LAYOUT;
                active = 1;
        if (tbl->part == TBL_PART_OPTS) {
                tbl->part = TBL_PART_LAYOUT;
                active = 1;

-               for (cp = p; *cp != '\0'; cp++) {
+               for (cp = p + pos; *cp != '\0'; cp++) {

                        switch (*cp) {
                        case '(':
                                active = 0;
                        switch (*cp) {
                        case '(':
                                active = 0;


@@ -64,8 +64,8 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
                        break;
                }
                if (*cp == ';') {
                        break;
                }
                if (*cp == ';') {

-                       tbl_option(tbl, ln, p);
-                       if (*(p = cp + 1) == '\0')
+                       tbl_option(tbl, ln, p, &pos);
+                       if (p[pos] == '\0')

                                return(ROFF_IGN);
                }
        }
                                return(ROFF_IGN);
                }
        }


@@ -74,15 +74,15 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 
        switch (tbl->part) {
        case TBL_PART_LAYOUT:
 
        switch (tbl->part) {
        case TBL_PART_LAYOUT:

-               tbl_layout(tbl, ln, p);
+               tbl_layout(tbl, ln, p, pos);

                return(ROFF_IGN);
        case TBL_PART_CDATA:
                return(ROFF_IGN);
        case TBL_PART_CDATA:

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

        default:
                break;
        }
 
        default:
                break;
        }
 

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

        return(ROFF_TBL);
 }
 
        return(ROFF_TBL);
 }
 


@@ -91,7 +91,7 @@ tbl_alloc(int pos, int line, struct mparse *parse)
 {
        struct tbl_node *tbl;
 
 {
        struct tbl_node *tbl;
 

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

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


@@ -108,11 +108,10 @@ tbl_free(struct tbl_node *tbl)
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;

-       struct tbl_head *hp;

 
 

-       while (NULL != (rp = tbl->first_row)) {
+       while ((rp = tbl->first_row) != NULL) {

                tbl->first_row = rp->next;
                tbl->first_row = rp->next;

-               while (rp->first) {
+               while (rp->first != NULL) {

                        cp = rp->first;
                        rp->first = cp->next;
                        free(cp);
                        cp = rp->first;
                        rp->first = cp->next;
                        free(cp);


@@ -120,40 +119,30 @@ tbl_free(struct tbl_node *tbl)
                free(rp);
        }
 
                free(rp);
        }
 

-       while (NULL != (sp = tbl->first_span)) {
+       while ((sp = tbl->first_span) != NULL) {

                tbl->first_span = sp->next;
                tbl->first_span = sp->next;

-               while (sp->first) {
+               while (sp->first != NULL) {

                        dp = sp->first;
                        sp->first = dp->next;
                        dp = sp->first;
                        sp->first = dp->next;

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

                        free(dp);
                }
                free(sp);
        }
 
                        free(dp);
                }
                free(sp);
        }
 

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

        free(tbl);
 }
 
 void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
        free(tbl);
 }
 
 void
 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);
+       if (tbl->part == TBL_PART_CDATA)
+               mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
+                   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)
-               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
-                   tbl->line, tbl->pos, NULL);

 }
 
 const struct tbl_span *
 }
 
 const struct tbl_span *


@@ -169,7 +158,7 @@ tbl_span(struct tbl_node *tbl)
        return(span);
 }
 
        return(span);
 }
 

-void
+int

 tbl_end(struct tbl_node **tblp)
 {
        struct tbl_node *tbl;
 tbl_end(struct tbl_node **tblp)
 {
        struct tbl_node *tbl;


@@ -178,17 +167,17 @@ tbl_end(struct tbl_node **tblp)
        tbl = *tblp;
        *tblp = NULL;
 
        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;
        sp = tbl->first_span;
        while (sp != NULL && sp->first == NULL)
                sp = sp->next;

-       if (sp == NULL)
-               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,
+       if (sp == NULL) {
+               mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->parse,

                    tbl->line, tbl->pos, NULL);
                    tbl->line, tbl->pos, NULL);

+               return(0);
+       }
+       return(1);

 }
 }