All "low-hanging" macros implemented in term.c.

[mandoc.git] / validate.c

diff --git a/validate.c b/validate.c
index d5495d4fd66e7eb8577ed4e4606dfd55c2ae784c..7b109965e04da5039ae874eb2a15738dd90126b6 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.59 2009/02/25 11:37:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -55,6 +55,7 @@ static        int     check_text(struct mdoc *,
                        size_t, size_t, 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 };
 
@@ -355,8 +357,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 +367,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 +424,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 +433,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 +444,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