Fixed `-file' argument to `Bd', which is NOT a type, but instead just an argument.

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 1b04ccc79210d0a574b905696f2369f61db43dcc..779b71cb4af80af10c939ff09452e7e83d0df049 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.41 2009/07/25 16:03:03 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.48 2009/10/19 09:40:23 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -74,6 +74,7 @@ static        int      eerr_eq0(POST_ARGS);
 static int      eerr_eq1(POST_ARGS);
 static int      eerr_ge1(POST_ARGS);
 static int      eerr_le2(POST_ARGS);
 static int      eerr_eq1(POST_ARGS);
 static int      eerr_ge1(POST_ARGS);
 static int      eerr_le2(POST_ARGS);

+static int      eerr_le1(POST_ARGS);

 static int      ewarn_ge1(POST_ARGS);
 static int      herr_eq0(POST_ARGS);
 static int      herr_ge1(POST_ARGS);
 static int      ewarn_ge1(POST_ARGS);
 static int      herr_eq0(POST_ARGS);
 static int      herr_ge1(POST_ARGS);


@@ -81,7 +82,6 @@ static        int      hwarn_eq1(POST_ARGS);
 static int      hwarn_le1(POST_ARGS);
 
 static int      post_an(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);
 static int      post_at(POST_ARGS);
 static int      post_bf(POST_ARGS);
 static int      post_bl(POST_ARGS);


@@ -90,10 +90,10 @@ 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_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);
 static int      post_sh(POST_ARGS);
 static int      post_sh_body(POST_ARGS);
 static int      post_sh_head(POST_ARGS);

-static int      post_sp(POST_ARGS);

 static int      post_st(POST_ARGS);
 static int      pre_an(PRE_ARGS);
 static int      pre_bd(PRE_ARGS);
 static int      post_st(POST_ARGS);
 static int      pre_an(PRE_ARGS);
 static int      pre_bd(PRE_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_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 };
 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,9 +126,9 @@ 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_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_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };

-static v_post   posts_sp[] = { post_sp, NULL };
+static v_post   posts_sp[] = { eerr_le1, NULL };

 static v_post   posts_ss[] = { herr_ge1, NULL };
 static v_post   posts_st[] = { eerr_eq1, post_st, NULL };
 static v_post   posts_text[] = { eerr_ge1, NULL };
 static v_post   posts_ss[] = { herr_ge1, NULL };
 static v_post   posts_st[] = { eerr_eq1, post_st, NULL };
 static v_post   posts_text[] = { eerr_ge1, NULL };


@@ -176,7 +175,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Dv */ 
        { pres_er, posts_text },                /* Er */ 
        { NULL, NULL },                         /* Ev */ 
        { 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 */
        { NULL, NULL },                         /* Fa */ 
        { pres_fd, posts_wtext },               /* Fd */
        { NULL, NULL },                         /* Fl */


@@ -190,13 +189,13 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, posts_wline },                  /* Op */
        { NULL, NULL },                         /* Ot */
        { NULL, NULL },                         /* Pa */
        { 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 */ 
        { NULL, posts_xr },                     /* Xr */ 
        { NULL, posts_text },                   /* %A */
        { NULL, posts_st },                     /* St */ 
        { NULL, NULL },                         /* Va */
        { NULL, posts_text },                   /* Vt */ 
        { NULL, posts_xr },                     /* Xr */ 
        { NULL, posts_text },                   /* %A */

-       { NULL, posts_text },                   /* %B */
+       { NULL, posts_text },                   /* %B */ /* FIXME: can be used outside Rs/Re. */

        { NULL, posts_text },                   /* %D */
        { NULL, posts_text },                   /* %I */
        { NULL, posts_text },                   /* %J */
        { NULL, posts_text },                   /* %D */
        { NULL, posts_text },                   /* %I */
        { NULL, posts_text },                   /* %J */


@@ -204,7 +203,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, posts_text },                   /* %O */
        { NULL, posts_text },                   /* %P */
        { NULL, posts_text },                   /* %R */
        { NULL, posts_text },                   /* %O */
        { NULL, posts_text },                   /* %P */
        { NULL, posts_text },                   /* %R */

-       { NULL, posts_text },                   /* %T */
+       { NULL, posts_text },                   /* %T */ /* FIXME: can be used outside Rs/Re. */

        { NULL, posts_text },                   /* %V */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */
        { NULL, posts_text },                   /* %V */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */


@@ -239,7 +238,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Qo */
        { NULL, posts_wline },                  /* Qq */
        { NULL, NULL },                         /* Re */
        { 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 */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, posts_wline },                  /* Sq */


@@ -409,6 +408,7 @@ CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)  /* berr_ge1() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)     /* eerr_le2() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)     /* eerr_le2() */

+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_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() */


@@ -622,25 +622,33 @@ pre_bl(PRE_ARGS)
                case (MDOC_Inset):
                        /* FALLTHROUGH */
                case (MDOC_Column):
                case (MDOC_Inset):
                        /* FALLTHROUGH */
                case (MDOC_Column):

-                       if (-1 != type) 
+                       if (type >= 0) 

                                return(mdoc_nerr(mdoc, n, EMULTILIST));
                        type = n->args->argv[pos].arg;
                        break;
                                return(mdoc_nerr(mdoc, n, EMULTILIST));
                        type = n->args->argv[pos].arg;
                        break;

+               case (MDOC_Compact):
+                       if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE))
+                               return(0);
+                       break;

                case (MDOC_Width):
                case (MDOC_Width):

-                       if (-1 != width)
+                       if (width >= 0)

                                return(mdoc_nerr(mdoc, n, EARGREP));
                                return(mdoc_nerr(mdoc, n, EARGREP));

+                       if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE))
+                               return(0);

                        width = n->args->argv[pos].arg;
                        break;
                case (MDOC_Offset):
                        width = n->args->argv[pos].arg;
                        break;
                case (MDOC_Offset):

-                       if (-1 != offset)
+                       if (offset >= 0)

                                return(mdoc_nerr(mdoc, n, EARGREP));
                                return(mdoc_nerr(mdoc, n, EARGREP));

+                       if (type < 0 && ! mdoc_nwarn(mdoc, n, ENOTYPE))
+                               return(0);

                        offset = n->args->argv[pos].arg;
                        break;
                default:
                        break;
                }
 
                        offset = n->args->argv[pos].arg;
                        break;
                default:
                        break;
                }
 

-       if (-1 == type)
+       if (type < 0)

                return(mdoc_nerr(mdoc, n, ELISTTYPE));
 
        /* 
                return(mdoc_nerr(mdoc, n, ELISTTYPE));
 
        /* 


@@ -651,7 +659,7 @@ pre_bl(PRE_ARGS)
 
        switch (type) {
        case (MDOC_Tag):
 
        switch (type) {
        case (MDOC_Tag):

-               if (-1 == width && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))
+               if (width < 0 && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))

                        return(0);
                break;
        case (MDOC_Column):
                        return(0);
                break;
        case (MDOC_Column):


@@ -661,7 +669,7 @@ pre_bl(PRE_ARGS)
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Item):
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Item):

-               if (-1 != width && ! mdoc_nwarn(mdoc, n, ENOWIDTH))
+               if (width >= 0 && ! mdoc_nwarn(mdoc, n, ENOWIDTH))

                        return(0);
                break;
        default:
                        return(0);
                break;
        default:


@@ -695,8 +703,6 @@ pre_bd(PRE_ARGS)
                case (MDOC_Filled):
                        /* FALLTHROUGH */
                case (MDOC_Literal):
                case (MDOC_Filled):
                        /* FALLTHROUGH */
                case (MDOC_Literal):

-                       /* FALLTHROUGH */
-               case (MDOC_File):

                        if (0 == type++) 
                                break;
                        return(mdoc_nerr(mdoc, n, EMULTIDISP));
                        if (0 == type++) 
                                break;
                        return(mdoc_nerr(mdoc, n, EMULTIDISP));


@@ -921,16 +927,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)
 {
 static int
 post_it(POST_ARGS)
 {


@@ -1090,9 +1086,7 @@ post_bl(POST_ARGS)
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;
                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);
        }
 
        return(1);


@@ -1140,43 +1134,56 @@ post_root(POST_ARGS)
 
 
 static int
 
 
 static int

-post_sp(POST_ARGS)
+post_st(POST_ARGS)

 {
 {

-       long             lval;
-       char            *ep, *buf;

 
 

-       if (NULL == mdoc->last->child)
+       if (mdoc_a2st(mdoc->last->child->string))

                return(1);
                return(1);

-       else if ( ! eerr_eq1(mdoc))
-               return(0);
-
-       assert(MDOC_TEXT == mdoc->last->child->type);
-       buf = mdoc->last->child->string;
-       assert(buf);
-       
-       /* From OpenBSD's strtol(3). */
-       errno = 0;
-       lval = strtol(buf, &ep, 10);
-       if (buf[0] == '\0' || *ep != '\0')
-               return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
-
-       if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
-                       (lval > INT_MAX || lval < 0))
-               return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
-
-       return(1);
+       return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));

 }
 
 
 }
 
 

-
-

 static int
 static int

-post_st(POST_ARGS)
+post_rs(POST_ARGS)

 {
 {

+       struct mdoc_node        *nn;

 
 

-       if (mdoc_a2st(mdoc->last->child->string))
+       if (MDOC_BODY != mdoc->last->type)

                return(1);
                return(1);

-       return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));
+
+       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);

 }
 
 
 }