-/* $Id: tbl.c,v 1.4 2010/12/28 13:47:38 kristaps Exp $ */
+/* $Id: tbl.c,v 1.26 2011/07/25 15:37:00 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 const char tbl_toks[TBL_TOK__MAX] = {
- '(', ')', ',', ';', '.',
- ' ', '\t', '\0'
-};
-
-static void tbl_init(struct tbl *);
-static void tbl_clear(struct tbl *);
-static enum tbl_tok tbl_next_char(char);
-
-static void
-tbl_clear(struct tbl *tbl)
-{
-
-}
-
-static void
-tbl_init(struct tbl *tbl)
-{
-
- tbl->part = TBL_PART_OPTS;
-}
-
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;
cp = &p[offs];
len = (int)strlen(cp);
- if (len && TBL_PART_OPTS == tbl->part)
+ /*
+ * 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.
+ */
+
+ if (TBL_PART_OPTS == tbl->part && len)
if (';' != cp[len - 1])
tbl->part = TBL_PART_LAYOUT;
-
- return(ROFF_CONT);
+
+ /* Now process each logical section of the table. */
+
+ switch (tbl->part) {
+ case (TBL_PART_OPTS):
+ 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_CDATA):
+ return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+ default:
+ break;
+ }
+
+ /*
+ * This only returns zero if the line is empty, so we ignore it
+ * and continue on.
+ */
+ return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
}
-struct tbl *
-tbl_alloc(void)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)
{
- struct tbl *p;
-
- p = mandoc_malloc(sizeof(struct tbl));
- 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->part = TBL_PART_LAYOUT;
+ tbl->line = line;
+ tbl->pos = pos;
- tbl_clear(tbl);
- tbl_init(tbl);
+ if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+ mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+ tbl->line, tbl->pos, NULL);
}
-static enum tbl_tok
-tbl_next_char(char c)
+const struct tbl_span *
+tbl_span(struct tbl_node *tbl)
{
- int i;
-
- /*
- * These are delimiting tokens. They separate out words in the
- * token stream.
- *
- * FIXME: make this into a hashtable for faster lookup.
- */
- for (i = 0; i < TBL_TOK__MAX; i++)
- if (c == tbl_toks[i])
- return((enum tbl_tok)i);
-
- return(TBL_TOK__MAX);
+ 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);
}
-enum tbl_tok
-tbl_next(struct tbl *tbl, const char *p, int *pos)
+void
+tbl_end(struct tbl_node **tblp)
{
- int i;
- enum tbl_tok c;
-
- tbl->buf[0] = '\0';
-
- if (TBL_TOK__MAX != (c = tbl_next_char(p[*pos]))) {
- if (TBL_TOK_NIL != c) {
- tbl->buf[0] = p[*pos];
- tbl->buf[1] = '\0';
- (*pos)++;
- }
- return(c);
- }
+ struct tbl_node *tbl;
- /*
- * Copy words into a nil-terminated buffer. For now, we use a
- * static buffer. FIXME: eventually this should be made into a
- * dynamic one living in struct tbl.
- */
+ tbl = *tblp;
+ *tblp = NULL;
- for (i = 0; i < BUFSIZ; i++, (*pos)++)
- if (TBL_TOK__MAX == tbl_next_char(p[*pos]))
- tbl->buf[i] = p[*pos];
- else
- break;
+ if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+ mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+ tbl->line, tbl->pos, NULL);
- assert(i < BUFSIZ);
- tbl->buf[i] = '\0';
+ if (tbl->last_span)
+ tbl->last_span->flags |= TBL_SPAN_LAST;
- return(TBL_TOK__MAX);
+ if (TBL_PART_CDATA == tbl->part)
+ mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+ tbl->line, tbl->pos, NULL);
}
-
git.ckatri.com / mandoc.git / blobdiff