Lintified sources.

[mandoc.git] / validate.c

diff --git a/validate.c b/validate.c
index d5495d4fd66e7eb8577ed4e4606dfd55c2ae784c..ea91d92f4b6522d21bdfdba9ff02f9f11afa6ef9 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.57 2009/02/24 13:57:17 kristaps Exp $ */
+/* $Id: validate.c,v 1.63 2009/02/27 09:39:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -52,9 +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     err_child_lt(struct mdoc *, const char *, int);
+static int     warn_child_lt(struct mdoc *, const char *, int);
 static int     err_child_gt(struct mdoc *, const char *, int);
 static int     warn_child_gt(struct mdoc *, const char *, int);
 static int     err_child_eq(struct mdoc *, const char *, int);
@@ -89,7 +90,7 @@ static        int     pre_prologue(PRE_ARGS);
 /* Specific post-child-parse routines. */
 
 static int     herr_ge1(POST_ARGS);
-static int     herr_le1(POST_ARGS);
+static int     hwarn_le1(POST_ARGS);
 static int     herr_eq0(POST_ARGS);
 static int     eerr_eq0(POST_ARGS);
 static int     eerr_le1(POST_ARGS);
@@ -99,6 +100,7 @@ static       int     eerr_ge1(POST_ARGS);
 static int     ewarn_eq0(POST_ARGS);
 static int     ewarn_eq1(POST_ARGS);
 static int     bwarn_ge1(POST_ARGS);
+static int     hwarn_eq1(POST_ARGS);
 static int     ewarn_ge1(POST_ARGS);
 static int     ebool(POST_ARGS);
 
@@ -152,9 +154,9 @@ static      v_post  posts_an[] = { post_an, NULL };
 static v_post  posts_at[] = { post_at, NULL };
 static v_post  posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL };
 static v_post  posts_nm[] = { post_nm, NULL };
-static v_post  posts_bf[] = { herr_le1, post_bf, NULL };
+static v_post  posts_bf[] = { hwarn_le1, post_bf, NULL };
 static v_post  posts_rs[] = { herr_eq0, bwarn_ge1, NULL };
-static v_post  posts_fo[] = { bwarn_ge1, NULL };
+static v_post  posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 static v_post  posts_bk[] = { herr_eq0, bwarn_ge1, NULL };
 static v_post  posts_fd[] = { ewarn_ge1, post_fd, NULL };
 
@@ -276,7 +278,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) {
@@ -294,10 +297,10 @@ mdoc_valid_pre(struct mdoc *mdoc,
                        node->data.block.argc :
                        node->data.elem.argc;
 
-               for (i = 0; i < argc; i++) {
+               for (i = 0; i < (int)argc; i++) {
                        if (0 == argv[i].sz)
                                continue;
-                       for (j = 0; j < argv[i].sz; j++) {
+                       for (j = 0; j < (int)argv[i].sz; j++) {
                                tp = argv[i].value[j];
                                line = argv[i].line;
                                pos = argv[i].pos;
@@ -355,8 +358,8 @@ warn_count(struct mdoc *m, const char *k,
 {
 
        return(mdoc_warn(m, WARN_SYNTAX, 
-                               "suggests %s %d %s (has %d)", 
-                               v, want, k, has));
+                               "suggests %s %s %d (has %d)", 
+                               v, k, want, has));
 }
 
 
@@ -365,8 +368,8 @@ err_count(struct mdoc *m, const char *k,
                int want, const char *v, int has)
 {
 
-       return(mdoc_err(m, "requires %s %d %s (has %d)",
-                               v, want, k, has));
+       return(mdoc_err(m, "requires %s %s %d (has %d)",
+                               v, k, want, has));
 }
 
 
@@ -422,7 +425,7 @@ h##lvl##_##name(POST_ARGS)                                  \
 {                                                              \
        if (MDOC_HEAD != mdoc->last->type)                      \
                return(1);                                      \
-       return(func(mdoc, "multiline parameters", (num)));      \
+       return(func(mdoc, "line parameters", (num)));           \
 }
 
 
@@ -431,6 +434,7 @@ CHECK_CHILD_DEFN(err, gt, >)                        /* err_child_gt() */
 CHECK_CHILD_DEFN(warn, eq, ==)                 /* warn_child_eq() */
 CHECK_CHILD_DEFN(err, eq, ==)                  /* err_child_eq() */
 CHECK_CHILD_DEFN(err, lt, <)                   /* err_child_lt() */
+CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
 CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1)   /* ewarn_eq1() */
 CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)   /* ewarn_eq0() */
@@ -441,8 +445,9 @@ CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)  /* eerr_le1() */
 CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0)     /* eerr_eq0() */
 CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0)     /* eerr_ge1() */
 CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0)     /* herr_eq0() */
-CHECK_HEAD_DEFN(le1, err, err_child_lt, 2)     /* herr_le1() */
+CHECK_HEAD_DEFN(le1, warn, warn_child_lt, 2)   /* hwarn_le1() */
 CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0)     /* herr_ge1() */
+CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1)   /* hwarn_eq1() */
 
 
 static int
@@ -472,18 +477,20 @@ check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs)
 
 
 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(*p) && '\t' != *p)
+               if ( ! isprint((int)*p) && '\t' != *p)
                        return(mdoc_perr(mdoc, line, pos,
                                        "invalid characters"));
                if ('\\' != *p)
                        continue;
                if ((c = mdoc_isescape(p))) {
-                       p += (c - 1);
+                       p += (int)c - 1;
                        continue;
                }
                return(mdoc_perr(mdoc, line, pos,
@@ -536,7 +543,7 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-       int              type, err, i;
+       int              type, i, width, offset;
        struct mdoc_arg *argv;
        size_t           argc;
 
@@ -547,8 +554,10 @@ pre_bl(PRE_ARGS)
 
        /* Make sure that only one type of list is specified.  */
 
+       type = offset = width = -1;
+
        /* LINTED */
-       for (i = 0, type = err = 0; i < (int)argc; i++) {
+       for (i = 0; i < (int)argc; i++) {
                argv = &n->data.block.argv[i];
 
                switch (argv->arg) {
@@ -573,18 +582,60 @@ pre_bl(PRE_ARGS)
                case (MDOC_Inset):
                        /* FALLTHROUGH */
                case (MDOC_Column):
-                       if (0 == type++)
+                       if (-1 == type) {
+                               type = argv->arg;
                                break;
+                       }
                        return(mdoc_perr(mdoc, argv->line, argv->pos, 
                                        "multiple types specified"));
+               case (MDOC_Width):
+                       if (-1 == width) {
+                               width = argv->arg;
+                               break;
+                       }
+                       return(mdoc_perr(mdoc, argv->line, argv->pos, 
+                                       "multiple -%s arguments",
+                                       mdoc_argnames[MDOC_Width]));
+               case (MDOC_Offset):
+                       if (-1 == offset) {
+                               offset = argv->arg;
+                               break;
+                       }
+                       return(mdoc_perr(mdoc, argv->line, argv->pos, 
+                                       "multiple -%s arguments",
+                                       mdoc_argnames[MDOC_Offset]));
                default:
                        break;
                }
        }
 
-       if (type)
-               return(1);
-       return(mdoc_err(mdoc, "no type specified"));
+       if (-1 == type)
+               return(mdoc_err(mdoc, "no type specified"));
+
+       switch (type) {
+       case (MDOC_Column):
+               /* FALLTHROUGH */
+       case (MDOC_Diag):
+               /* FALLTHROUGH */
+       case (MDOC_Inset):
+               /* FALLTHROUGH */
+       case (MDOC_Item):
+               if (-1 == width)
+                       break;
+               return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+                               "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]));
+       default:
+               break;
+       }
+
+       return(1);
 }
 
 
@@ -655,7 +706,6 @@ static int
 pre_it(PRE_ARGS)
 {
 
-       /* TODO: -width attribute must be specified for -tag. */
        /* TODO: children too big for -width? */
 
        if (MDOC_BLOCK != n->type)