* mdocml: Completely rewrite the top level of the layout parser.
@ 2014-11-25 21:41 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2014-11-25 21:41 UTC (permalink / raw)
To: source
Log Message:
-----------
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.
Modified Files:
--------------
mdocml:
tbl_layout.c
Revision Data
-------------
Index: tbl_layout.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tbl_layout.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -Ltbl_layout.c -Ltbl_layout.c -u -p -r1.29 -r1.30
--- tbl_layout.c
+++ tbl_layout.c
@@ -59,7 +59,6 @@ static int mods(struct tbl_node *, str
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);
@@ -300,68 +299,54 @@ cell(struct tbl_node *tbl, struct tbl_ro
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)
+int
+tbl_layout(struct tbl_node *tbl, int ln, const char *p)
{
struct tbl_row *rp;
+ int pos;
-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;
+ pos = 0;
+ rp = NULL;
-cell:
- while (isspace((unsigned char)p[*pos]))
- (*pos)++;
+ for (;;) {
+ /* Skip whitespace before and after each cell. */
- /* Safely exit layout context. */
+ while (isspace((unsigned char)p[pos]))
+ pos++;
- if ('.' == p[*pos]) {
- tbl->part = TBL_PART_DATA;
- if (NULL == tbl->first_row)
+ 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);
- (*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 pos;
-
- pos = 0;
- row(tbl, ln, p, &pos);
+ 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 *
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-25 21:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-25 21:41 mdocml: Completely rewrite the top level of the layout parser schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).