Remove a redundant condition in .%T handling, no functional change.

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index b6492524f9c09df81cfcc45bbde183ec4f32f585..ed6fbd876a863c048c02e46a06f5995ce3c22543 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl.c,v 1.32 2015/01/21 00:47:04 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.40 2015/10/06 18:32:20 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * 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


@@ -32,42 +32,58 @@
 
 
 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)

 {
 {

-       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 ROFF_IGN;
+               }
+       }

 
 

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

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

-       case TBL_PART_OPTS:
-               tbl_option(tbl, ln, p);
-               return(ROFF_IGN);

        case TBL_PART_LAYOUT:
        case TBL_PART_LAYOUT:

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

        case TBL_PART_CDATA:
        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);
-       return(ROFF_TBL);
+       tbl_data(tbl, ln, p, pos);
+       return ROFF_TBL;

 }
 
 struct tbl_node *
 }
 
 struct tbl_node *


@@ -75,15 +91,14 @@ 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->part = TBL_PART_OPTS;
        tbl->opts.tab = '\t';
        tbl->line = line;
        tbl->pos = pos;
        tbl->parse = parse;
        tbl->part = TBL_PART_OPTS;
        tbl->opts.tab = '\t';

-       tbl->opts.linesize = 12;

        tbl->opts.decimal = '.';
        tbl->opts.decimal = '.';

-       return(tbl);
+       return tbl;

 }
 
 void
 }
 
 void


@@ -93,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);


@@ -105,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 *


@@ -151,25 +155,29 @@ tbl_span(struct tbl_node *tbl)
                                 : tbl->first_span;
        if (span)
                tbl->current_span = span;
                                 : tbl->first_span;
        if (span)
                tbl->current_span = span;

-       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;

+       struct tbl_span *sp;

 
        tbl = *tblp;
        *tblp = NULL;
 
 
        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 == TBL_PART_CDATA)
+               mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
+                   tbl->line, tbl->pos, "TE");

 
 

-       if (TBL_PART_CDATA == tbl->part)
-               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+       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);
                    tbl->line, tbl->pos, NULL);

+               return 0;
+       }
+       return 1;

 }
 }