Clean up consts (noted by Joerg Sonnenberger and Ulrich Sporlein).

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 9c8d679ac2b8d4bab4d301f0a9b67a134e569e60..974d6448bbd0295acb0dd70b127d184d0f82e49d 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.37 2009/07/18 23:31:04 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.44 2009/09/24 15:08:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -81,7 +81,6 @@ static        int      hwarn_eq1(POST_ARGS);
 static int      hwarn_le1(POST_ARGS);
 
 static int      post_an(POST_ARGS);
-static int      post_args(POST_ARGS);
 static int      post_at(POST_ARGS);
 static int      post_bf(POST_ARGS);
 static int      post_bl(POST_ARGS);
@@ -90,6 +89,7 @@ static        int      post_it(POST_ARGS);
 static int      post_lb(POST_ARGS);
 static int      post_nm(POST_ARGS);
 static int      post_root(POST_ARGS);
+static int      post_rs(POST_ARGS);
 static int      post_sh(POST_ARGS);
 static int      post_sh_body(POST_ARGS);
 static int      post_sh_head(POST_ARGS);
@@ -118,7 +118,6 @@ static      v_post   posts_bd[] = { herr_eq0, bwarn_ge1, NULL };
 static v_post   posts_bf[] = { hwarn_le1, post_bf, NULL };
 static v_post   posts_bl[] = { bwarn_ge1, post_bl, NULL };
 static v_post   posts_bool[] = { eerr_eq1, ebool, NULL };
-static v_post   posts_ex[] = { eerr_eq0, post_args, NULL };
 static v_post   posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 static v_post   posts_in[] = { eerr_eq1, NULL };
 static v_post   posts_it[] = { post_it, NULL };
@@ -127,7 +126,7 @@ static      v_post   posts_nd[] = { berr_ge1, NULL };
 static v_post   posts_nm[] = { post_nm, NULL };
 static v_post   posts_notext[] = { eerr_eq0, NULL };
 static v_post   posts_pf[] = { eerr_eq1, NULL };
-static v_post   posts_rv[] = { eerr_eq0, post_args, NULL };
+static v_post   posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL };
 static v_post   posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
 static v_post   posts_sp[] = { post_sp, NULL };
 static v_post   posts_ss[] = { herr_ge1, NULL };
@@ -176,7 +175,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Dv */ 
        { pres_er, posts_text },                /* Er */ 
        { NULL, NULL },                         /* Ev */ 
-       { pres_ex, posts_ex },                  /* Ex */ 
+       { pres_ex, NULL },                      /* Ex */ 
        { NULL, NULL },                         /* Fa */ 
        { pres_fd, posts_wtext },               /* Fd */
        { NULL, NULL },                         /* Fl */
@@ -190,7 +189,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, posts_wline },                  /* Op */
        { NULL, NULL },                         /* Ot */
        { NULL, NULL },                         /* Pa */
-       { pres_rv, posts_rv },                  /* Rv */
+       { pres_rv, NULL },                      /* Rv */
        { NULL, posts_st },                     /* St */ 
        { NULL, NULL },                         /* Va */
        { NULL, posts_text },                   /* Vt */ 
@@ -239,7 +238,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Qo */
        { NULL, posts_wline },                  /* Qq */
        { NULL, NULL },                         /* Re */
-       { NULL, posts_wline },                  /* Rs */
+       { NULL, posts_rs },                     /* Rs */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, posts_wline },                  /* Sq */
@@ -912,7 +911,7 @@ post_an(POST_ARGS)
        if (mdoc->last->args) {
                if (NULL == mdoc->last->child)
                        return(1);
-               return(mdoc_nerr(mdoc, mdoc->last, ELINE));
+               return(mdoc_nerr(mdoc, mdoc->last, ENOLINE));
        }
 
        if (mdoc->last->child)
@@ -921,16 +920,6 @@ post_an(POST_ARGS)
 }
 
 
-static int
-post_args(POST_ARGS)
-{
-
-       if (mdoc->last->args)
-               return(1);
-       return(mdoc_nerr(mdoc, mdoc->last, ELINE));
-}
-
-
 static int
 post_it(POST_ARGS)
 {
@@ -1028,11 +1017,20 @@ post_it(POST_ARGS)
                c = mdoc->last->child;
                for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
                        i++;
-               if (i == cols)
+
+               if (i < cols || i == (cols + 1)) {
+                       if ( ! mdoc_vwarn(mdoc, mdoc->last->line, 
+                                       mdoc->last->pos, "column "
+                                       "mismatch: have %d, want %d", 
+                                       i, cols))
+                               return(0);
+                       break;
+               } else if (i == cols)
                        break;
-               return(mdoc_verr(mdoc, mdoc->last->line, mdoc->last->pos,
-                               "column mismatch (have %d, want %d)", 
-                               i, cols));
+
+               return(mdoc_verr(mdoc, mdoc->last->line, 
+                               mdoc->last->pos, "column mismatch: "
+                               "have %d, want %d", i, cols));
        default:
                break;
        }
@@ -1081,9 +1079,7 @@ post_bl(POST_ARGS)
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;
-               return(mdoc_verr(mdoc, n->line, n->pos, 
-                               "bad child of parent %s",
-                               mdoc_macronames[mdoc->last->tok]));
+               return(mdoc_nerr(mdoc, n, EBADCHILD));
        }
 
        return(1);
@@ -1171,6 +1167,50 @@ post_st(POST_ARGS)
 }
 
 
+static int
+post_rs(POST_ARGS)
+{
+       struct mdoc_node        *nn;
+
+       if (MDOC_BODY != mdoc->last->type)
+               return(1);
+
+       for (nn = mdoc->last->child; nn; nn = nn->next)
+               switch (nn->tok) {
+               case(MDOC__Q):
+                       /* FALLTHROUGH */
+               case(MDOC__C):
+                       /* FALLTHROUGH */
+               case(MDOC__A):
+                       /* FALLTHROUGH */
+               case(MDOC__B):
+                       /* FALLTHROUGH */
+               case(MDOC__D):
+                       /* FALLTHROUGH */
+               case(MDOC__I):
+                       /* FALLTHROUGH */
+               case(MDOC__J):
+                       /* FALLTHROUGH */
+               case(MDOC__N):
+                       /* FALLTHROUGH */
+               case(MDOC__O):
+                       /* FALLTHROUGH */
+               case(MDOC__P):
+                       /* FALLTHROUGH */
+               case(MDOC__R):
+                       /* FALLTHROUGH */
+               case(MDOC__T):
+                       /* FALLTHROUGH */
+               case(MDOC__V):
+                       break;
+               default:
+                       return(mdoc_nerr(mdoc, nn, EBADCHILD));
+               }
+
+       return(1);
+}
+
+
 static int
 post_sh(POST_ARGS)
 {
@@ -1210,6 +1250,7 @@ post_sh_body(POST_ARGS)
                        return(0);
        }
 
+       assert(n);
        if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)
                return(1);
        return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC));