-/* $Id: tbl.c,v 1.9 2010/12/30 09:34:07 kristaps Exp $ */
+/* $Id: tbl.c,v 1.25 2011/04/04 23:04:38 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
* 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 <time.h>
#include "mandoc.h"
-#include "roff.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;
- struct tbl_span *sp;
- struct tbl_dat *dp;
-
- while (tbl->first_row) {
- rp = tbl->first_row;
- tbl->first_row = rp->next;
- while (rp->first) {
- cp = rp->first;
- rp->first = cp->next;
- free(cp);
- }
- free(rp);
- }
-
- tbl->last_row = NULL;
-
- while (tbl->first_span) {
- sp = tbl->first_span;
- tbl->first_span = sp->next;
- while (sp->first) {
- dp = sp->first;
- sp->first = dp->next;
- if (dp->string)
- free(dp->string);
- free(dp);
- }
- free(sp);
- }
-
- tbl->last_span = NULL;
-}
-
-static void
-tbl_init(struct tbl *tbl)
-{
-
- tbl->part = TBL_PART_OPTS;
- tbl->tab = '\t';
- tbl->linesize = 12;
- tbl->decimal = '.';
-}
-
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;
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_DATA):
+ case (TBL_PART_CDATA):
+ return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+ default:
break;
}
- /*
- * FIXME: allow the original string to slip through for the time
- * being.
+ /*
+ * This only returns zero if the line is empty, so we ignore it
+ * and continue on.
*/
- return(tbl_data(tbl, ln, p) ? ROFF_CONT : ROFF_ERR);
+ 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
-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
-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_clear(tbl);
- tbl_init(tbl);
+ 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 *
+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
-tbl_restart(struct tbl *tbl)
+tbl_end(struct tbl_node *tbl)
{
- tbl->part = TBL_PART_LAYOUT;
+ 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);
}
git.ckatri.com / mandoc.git / blobdiff