Back out lorder, which doesn't seem necessary (?). I think this means all

[mandoc.git] / tbl_opts.c

diff --git a/tbl_opts.c b/tbl_opts.c
index 8500b74d8ec481a6bb9a6a3578b80c6bcb36ca44..5bd67f80ee3a263b0890f916f98ce7f993cf1038 100644 (file)
--- a/tbl_opts.c
+++ b/tbl_opts.c
@@ -1,6 +1,6 @@
-/*     $Id: tbl_opts.c,v 1.5 2011/01/02 10:10:57 kristaps Exp $ */
+/*     $Id: tbl_opts.c,v 1.12 2011/09/18 14:14:15 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,12 +14,17 @@
  * 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 <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
+#include "libmandoc.h"
 #include "libroff.h"
 
 enum   tbl_ident {
@@ -72,12 +77,12 @@ static      const struct tbl_phrase keys[KEY_MAXKEYS] = {
 };
 
 static int              arg(struct tbl_node *, int, 
-                               const char *, int *, int);
+                               const char *, int *, enum tbl_ident);
 static void             opt(struct tbl_node *, int, 
                                const char *, int *);
 
 static int
-arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
+arg(struct tbl_node *tbl, int ln, const char *p, int *pos, enum tbl_ident key)
 {
        int              i;
        char             buf[KEY_MAXNUMSZ];
@@ -88,7 +93,8 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
        /* Arguments always begin with a parenthesis. */
 
        if ('(' != p[*pos]) {
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, 
+                               ln, *pos, NULL);
                return(0);
        }
 
@@ -102,13 +108,15 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
 
        switch (key) {
        case (KEY_DELIM):
-               if ('\0' == (tbl->opts.delims[0] = p[(*pos)++])) {
-                       TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               if ('\0' == p[(*pos)++]) {
+                       mandoc_msg(MANDOCERR_TBL, tbl->parse,
+                                       ln, *pos - 1, NULL);
                        return(0);
                } 
 
-               if ('\0' == (tbl->opts.delims[1] = p[(*pos)++])) {
-                       TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               if ('\0' == p[(*pos)++]) {
+                       mandoc_msg(MANDOCERR_TBL, tbl->parse,
+                                       ln, *pos - 1, NULL);
                        return(0);
                } 
                break;
@@ -116,7 +124,8 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
                if ('\0' != (tbl->opts.tab = p[(*pos)++]))
                        break;
 
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse,
+                               ln, *pos - 1, NULL);
                return(0);
        case (KEY_LINESIZE):
                for (i = 0; i < KEY_MAXNUMSZ && p[*pos]; i++, (*pos)++) {
@@ -131,13 +140,14 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
                        break;
                }
 
-               (*tbl->msg)(MANDOCERR_TBL, tbl->data, ln, *pos, NULL);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, *pos, NULL);
                return(0);
        case (KEY_DPOINT):
                if ('\0' != (tbl->opts.decimal = p[(*pos)++]))
                        break;
 
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, 
+                               ln, *pos - 1, NULL);
                return(0);
        default:
                abort();
@@ -149,7 +159,7 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
        if (')' == p[(*pos)++])
                return(1);
 
-       TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+       mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, *pos - 1, NULL);
        return(0);
 }
 
@@ -188,7 +198,7 @@ again:      /*
        /* Copy up to first non-alpha character. */
 
        for (sv = *pos, i = 0; i < KEY_MAXNAME; i++, (*pos)++) {
-               buf[i] = tolower(p[*pos]);
+               buf[i] = (char)tolower((unsigned char)p[*pos]);
                if ( ! isalpha((unsigned char)buf[i]))
                        break;
        }
@@ -196,7 +206,7 @@ again:      /*
        /* Exit if buffer is empty (or overrun). */
 
        if (KEY_MAXNAME == i || 0 == i) {
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, *pos, NULL);
                return;
        }
 
@@ -235,7 +245,7 @@ again:      /*
         */
 
        if (KEY_MAXKEYS == i)
-               TBL_MSG(tbl, MANDOCERR_TBLOPT, ln, sv);
+               mandoc_msg(MANDOCERR_TBLOPT, tbl->parse, ln, sv, NULL);
 
        goto again;
        /* NOTREACHED */