Cleaned up ctype functions (netbsd).

[mandoc.git] / validate.c

diff --git a/validate.c b/validate.c
index 46629654741d59df8718f4a0d3c4f5d105d133c3..cc680737e32e0adb02c522b29e6f1d32b405711a 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.62 2009/02/27 09:14:02 kristaps Exp $ */
+/* $Id: validate.c,v 1.68 2009/03/05 13:12:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -22,6 +22,8 @@
 
 #include "private.h"
 
+/* FIXME: .Bl -diag can't have non-text children in HEAD. */
+
 /*
  * Pre- and post-validate macros as they're parsed.  Pre-validation
  * occurs when the macro has been detected and its arguments parsed.
@@ -36,9 +38,7 @@
 typedef        int     (*v_pre)(PRE_ARGS);
 typedef        int     (*v_post)(POST_ARGS);
 
-/* FIXME: some sections should only occur in specific msecs. */
-/* FIXME: ignoring Pp. */
-/* FIXME: math symbols. */
+/* TODO: ignoring Pp (it's superfluous in some invocations). */
 
 struct valids {
        v_pre   *pre;
@@ -52,7 +52,10 @@ static       int     check_msec(PRE_ARGS, int, enum mdoc_msec *);
 static int     check_stdarg(PRE_ARGS);
 
 static int     check_text(struct mdoc *, 
-                       size_t, size_t, const char *);
+                       int, int, const char *);
+static int     check_argv(struct mdoc *, 
+                       const struct mdoc_node *,
+                       const struct mdoc_arg *);
 
 static int     err_child_lt(struct mdoc *, const char *, int);
 static int     warn_child_lt(struct mdoc *, const char *, int);
@@ -278,7 +281,8 @@ mdoc_valid_pre(struct mdoc *mdoc,
 {
        v_pre           *p;
        struct mdoc_arg *argv;
-       size_t           argc, i, j, line, pos;
+       size_t           argc;
+       int              line, pos, i, j;
        const char      *tp;
 
        if (MDOC_TEXT == node->type) {
@@ -296,16 +300,16 @@ mdoc_valid_pre(struct mdoc *mdoc,
                        node->data.block.argc :
                        node->data.elem.argc;
 
-               for (i = 0; i < argc; i++) {
-                       if (0 == argv[i].sz)
-                               continue;
-                       for (j = 0; j < argv[i].sz; j++) {
+               for (i = 0; i < (int)argc; i++) {
+                       for (j = 0; j < (int)argv[i].sz; j++) {
                                tp = argv[i].value[j];
                                line = argv[i].line;
                                pos = argv[i].pos;
                                if ( ! check_text(mdoc, line, pos, tp))
                                        return(0);
                        }
+                       if ( ! check_argv(mdoc, node, &argv[i]))
+                               return(0);
                }
        }
 
@@ -475,25 +479,64 @@ check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs)
 }
 
 
+/*
+ * Check over an argument.  When this has more stuff in it, make this
+ * into a table-driven function; until then, a switch is fine.
+ */
+static int
+check_argv(struct mdoc *mdoc, 
+               const struct mdoc_node *node,
+               const struct mdoc_arg *argv)
+{
+
+
+       switch (argv->arg) {
+       case (MDOC_Std):
+               switch (node->tok) {
+               case (MDOC_Ex):
+                       /*
+                        * If the -std does not have an argument, then
+                        * set it with the default name (if set).  This
+                        * only happens with MDOC_Ex.
+                        */
+                       if (1 == argv->sz)
+                               return(1);
+                       assert(0 == argv->sz);
+                       if (mdoc->meta.name)
+                               return(1);
+                       return(mdoc_nerr(mdoc, node, 
+                                       "default name not yet set"));
+               default:
+                       break;
+               }
+               break;
+       default:
+               break;
+       }
+
+       return(1);
+}
+
+
 static int
-check_text(struct mdoc *mdoc, size_t line, size_t pos, const char *p)
+check_text(struct mdoc *mdoc, int line, int pos, const char *p)
 {
        size_t           c;
 
        /* XXX - indicate deprecated escapes \*(xx and \*x. */
 
        for ( ; *p; p++) {
-               if ( ! isprint((int)*p) && '\t' != *p)
+               if ( ! isprint((u_char)*p) && '\t' != *p)
                        return(mdoc_perr(mdoc, line, pos,
-                                       "invalid characters"));
+                               "invalid non-printing characters"));
                if ('\\' != *p)
                        continue;
                if ((c = mdoc_isescape(p))) {
-                       p += (c - 1);
+                       p += (int)c - 1;
                        continue;
                }
-               return(mdoc_perr(mdoc, line, pos,
-                                       "invalid escape sequence"));
+               return(mdoc_perr(mdoc, line, pos, 
+                               "invalid escape sequence"));
        }
 
        return(1);
@@ -625,11 +668,11 @@ pre_bl(PRE_ARGS)
                                "superfluous -%s argument",
                                mdoc_argnames[MDOC_Width]));
        case (MDOC_Tag):
-               if (-1 != width)
-                       break;
-               return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
-                               "suggest -%s argument",
-                               mdoc_argnames[MDOC_Width]));
+               if (-1 == width && ! mdoc_nwarn(mdoc, n, WARN_SYNTAX, 
+                                       "suggest -%s argument",
+                                       mdoc_argnames[MDOC_Width]))
+                       return(0);
+               break;
        default:
                break;
        }
@@ -705,8 +748,6 @@ static int
 pre_it(PRE_ARGS)
 {
 
-       /* TODO: children too big for -width? */
-
        if (MDOC_BLOCK != n->type)
                return(1);
        return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
@@ -1055,19 +1096,25 @@ post_bl(POST_ARGS)
 
        if (MDOC_BODY != mdoc->last->type)
                return(1);
+       if (NULL == (mdoc->last->child))
+               return(1);
+
+       /*
+        * Only allow `It' macros to be the immediate descendants of the
+        * `Bl' list. 
+        */
 
        /* LINTED */
        for (n = mdoc->last->child; n; n = n->next) {
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;
-               break;
-       }
 
-       if (NULL == n)
-               return(1);
+               return(mdoc_nerr(mdoc, n, "bad child of parent %s",
+                               mdoc_macronames[mdoc->last->tok]));
+       }
 
-       return(mdoc_nerr(mdoc, n, "bad child of parent list"));
+       return(1);
 }