Completely rewrite the top level of the layout parser.

* Do not allocate lines unless there are cells.
* Make the MANDOCERR_TBLNOLAYOUT message actually work.
Also get rid of one static function and two goto statements.

diff --git a/tbl_layout.c b/tbl_layout.c
index 71078a9d6f0bdb7aef146ae45aab5abdb7d00df8..033074afbb107bf7e9105014d6d481a6ce2eb543 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_layout.c,v 1.29 2014/10/14 02:16:06 schwarze Exp $ */
+/*     $Id: tbl_layout.c,v 1.30 2014/11/25 21:41:47 schwarze Exp $ */

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


@@ -59,7 +59,6 @@ static        int              mods(struct tbl_node *, struct tbl_cell *,
                                int, const char *, int *);
 static int              cell(struct tbl_node *, struct tbl_row *,
                                int, const char *, int *);
                                int, const char *, int *);
 static int              cell(struct tbl_node *, struct tbl_row *,
                                int, const char *, int *);

-static void             row(struct tbl_node *, int, const char *, int *);

 static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *,
                                enum tbl_cellt, int vert);
 
 static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *,
                                enum tbl_cellt, int vert);
 


@@ -300,68 +299,54 @@ cell(struct tbl_node *tbl, struct tbl_row *rp,
        return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos));
 }
 
        return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos));
 }
 

-static void
-row(struct tbl_node *tbl, int ln, const char *p, int *pos)
-{
-       struct tbl_row  *rp;
-
-row:   /*
-        * EBNF describing this section:
-        *
-        * row          ::= row_list [:space:]* [.]?[\n]
-        * row_list     ::= [:space:]* row_elem row_tail
-        * row_tail     ::= [:space:]*[,] row_list |
-        *                  epsilon
-        * row_elem     ::= [\t\ ]*[:alpha:]+
-        */
-
-       rp = mandoc_calloc(1, sizeof(struct tbl_row));
-       if (tbl->last_row)
-               tbl->last_row->next = rp;
-       else
-               tbl->first_row = rp;
-       tbl->last_row = rp;
-
-cell:
-       while (isspace((unsigned char)p[*pos]))
-               (*pos)++;
-
-       /* Safely exit layout context. */
-
-       if ('.' == p[*pos]) {
-               tbl->part = TBL_PART_DATA;
-               if (NULL == tbl->first_row)
-                       mandoc_msg(MANDOCERR_TBLNOLAYOUT,
-                           tbl->parse, ln, *pos, NULL);
-               (*pos)++;
-               return;
-       }
-
-       /* End (and possibly restart) a row. */
-
-       if (',' == p[*pos]) {
-               (*pos)++;
-               goto row;
-       } else if ('\0' == p[*pos])
-               return;
-
-       if ( ! cell(tbl, rp, ln, p, pos))
-               return;
-
-       goto cell;
-       /* NOTREACHED */
-}
-

 int
 tbl_layout(struct tbl_node *tbl, int ln, const char *p)
 {
 int
 tbl_layout(struct tbl_node *tbl, int ln, const char *p)
 {

+       struct tbl_row  *rp;

        int              pos;
 
        pos = 0;
        int              pos;
 
        pos = 0;

-       row(tbl, ln, p, &pos);
+       rp = NULL;
+
+       for (;;) {
+               /* Skip whitespace before and after each cell. */
+
+               while (isspace((unsigned char)p[pos]))
+                       pos++;
+
+               switch (p[pos]) {
+               case ',':  /* Next row on this input line. */
+                       pos++;
+                       rp = NULL;
+                       continue;
+               case '\0':  /* Next row on next input line. */
+                       return(1);
+               case '.':  /* End of layout. */
+                       pos++;
+                       tbl->part = TBL_PART_DATA;
+                       if (tbl->first_row != NULL)
+                               return(1);
+                       mandoc_msg(MANDOCERR_TBLNOLAYOUT,
+                           tbl->parse, ln, pos, NULL);
+                       rp = mandoc_calloc(1, sizeof(*rp));
+                       cell_alloc(tbl, rp, TBL_CELL_LEFT, 0);
+                       tbl->first_row = tbl->last_row = rp;
+                       return(1);
+               default:  /* Cell. */
+                       break;
+               }

 
 

-       /* Always succeed. */
-       return(1);
+               if (rp == NULL) {  /* First cell on this line. */
+                       rp = mandoc_calloc(1, sizeof(*rp));
+                       if (tbl->last_row)
+                               tbl->last_row->next = rp;
+                       else
+                               tbl->first_row = rp;
+                       tbl->last_row = rp;
+               }
+               if ( ! cell(tbl, rp, ln, p, &pos))
+                       return(1);
+       }

 }
 
 static struct tbl_cell *
 }
 
 static struct tbl_cell *