Remove the pod2man table entries. They can now be properly read and

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index f16ed8d38bf7cc4166dbfb8a25a90ef8ddfa76f2..617ee6e83ffb2bf441964f0e0a2610a1d3d4d7d0 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_validate.c,v 1.106 2010/07/02 13:12:47 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.116 2010/08/29 10:30:58 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -32,7 +32,6 @@
 #include "libmandoc.h"
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 #include "libmandoc.h"
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */

-/* TODO: ignoring Pp (it's superfluous in some invocations). */

 
 #define        PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define        POST_ARGS struct mdoc *mdoc
 
 #define        PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define        POST_ARGS struct mdoc *mdoc


@@ -65,10 +64,10 @@ static      int      err_count(struct mdoc *, const char *,
 static int      berr_ge1(POST_ARGS);
 static int      bwarn_ge1(POST_ARGS);
 static int      ebool(POST_ARGS);
 static int      berr_ge1(POST_ARGS);
 static int      bwarn_ge1(POST_ARGS);
 static int      ebool(POST_ARGS);

-static int      eerr_eq0(POST_ARGS);

 static int      eerr_eq1(POST_ARGS);
 static int      eerr_ge1(POST_ARGS);
 static int      eerr_le1(POST_ARGS);
 static int      eerr_eq1(POST_ARGS);
 static int      eerr_ge1(POST_ARGS);
 static int      eerr_le1(POST_ARGS);

+static int      ewarn_eq0(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);


@@ -118,7 +117,7 @@ static      v_post   posts_it[] = { post_it, NULL };
 static v_post   posts_lb[] = { eerr_eq1, post_lb, NULL };
 static v_post   posts_nd[] = { berr_ge1, NULL };
 static v_post   posts_nm[] = { post_nm, NULL };
 static v_post   posts_lb[] = { eerr_eq1, post_lb, NULL };
 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_notext[] = { ewarn_eq0, 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[] = { eerr_le1, 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[] = { eerr_le1, NULL };


@@ -146,7 +145,7 @@ static      v_pre    pres_ss[] = { pre_ss, NULL };
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ap */
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ap */

-       { pres_dd, posts_text },                /* Dd */
+       { pres_dd, posts_wtext },               /* Dd */

        { pres_dt, posts_dt },                  /* Dt */
        { pres_os, NULL },                      /* Os */
        { pres_sh, posts_sh },                  /* Sh */ 
        { pres_dt, posts_dt },                  /* Dt */
        { pres_os, NULL },                      /* Os */
        { pres_sh, posts_sh },                  /* Sh */ 


@@ -393,10 +392,10 @@ 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_BODY_DEFN(ge1, err, err_child_gt, 0)     /* berr_ge1() */
 CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
 CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)     /* berr_ge1() */

+CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)   /* ewarn_eq0() */

 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_ge1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)     /* eerr_le1() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_ge1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 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, warn, warn_child_lt, 2)   /* hwarn_le1() */
 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, warn, warn_child_lt, 2)   /* hwarn_le1() */


@@ -454,45 +453,42 @@ check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
 
 
 static int
 
 
 static int

-check_text(struct mdoc *mdoc, int line, int pos, char *p)
+check_text(struct mdoc *m, int ln, int pos, char *p)

 {
        int              c;
 {
        int              c;

-
-       /* 
-        * FIXME: we absolutely cannot let \b get through or it will
-        * destroy some assumptions in terms of format.
-        */
+       size_t           sz;

 
        for ( ; *p; p++, pos++) {
 
        for ( ; *p; p++, pos++) {

+               sz = strcspn(p, "\t\\");
+               p += (int)sz;
+
+               if ('\0' == *p)
+                       break;
+
+               pos += (int)sz;
+

                if ('\t' == *p) {
                if ('\t' == *p) {

-                       if ( ! (MDOC_LITERAL & mdoc->flags))
-                               if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))
-                                       return(0);
-               } else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p)
-                       if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))
-                               return(0);
+                       if (MDOC_LITERAL & m->flags)
+                               continue;
+                       if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB))
+                               continue;
+                       return(0);
+               }

 
 

-               if ('\\' != *p)
-                       continue;
+               /* Check the special character. */

 
                c = mandoc_special(p);
                if (c) {
                        p += c - 1;
                        pos += c - 1;
 
                c = mandoc_special(p);
                if (c) {
                        p += c - 1;
                        pos += c - 1;

-                       continue;
-               }
-
-               c = mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADESCAPE);
-               if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags) && ! c)
-                       return(c);
+               } else
+                       mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);

        }
 
        return(1);
 }
 
 
        }
 
        return(1);
 }
 
 

-
-

 static int
 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 {
 static int
 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 {


@@ -510,7 +506,6 @@ check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 }
 
 
 }
 
 

-

 static int
 pre_display(PRE_ARGS)
 {
 static int
 pre_display(PRE_ARGS)
 {


@@ -625,6 +620,8 @@ pre_bl(PRE_ARGS)
                        if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
                                return(0);
                        break;
                        if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
                                return(0);
                        break;

+               default:
+                       continue;

                }
 
                /* Check: duplicate auxiliary arguments. */
                }
 
                /* Check: duplicate auxiliary arguments. */


@@ -647,8 +644,16 @@ pre_bl(PRE_ARGS)
 
                /* Assign list type. */
 
 
                /* Assign list type. */
 

-               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE)
+               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {

                        n->data.Bl->type = lt;
                        n->data.Bl->type = lt;

+                       /* Set column information, too. */
+                       if (LIST_column == lt) {
+                               n->data.Bl->ncols = 
+                                       n->args->argv[i].sz;
+                               n->data.Bl->cols = (const char **)
+                                       n->args->argv[i].value;
+                       }
+               }

 
                /* The list type should come first. */
 
 
                /* The list type should come first. */
 


@@ -849,13 +854,20 @@ static int
 pre_an(PRE_ARGS)
 {
 
 pre_an(PRE_ARGS)
 {
 

-       if (NULL == n->args || 1 == n->args->argc)
+       if (NULL == n->args)

                return(1);
                return(1);

-       mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT, 
-                               n->line, n->pos,
-                               "line arguments == 1 (have %d)",
-                               n->args->argc);
-       return(0);
+       if (n->args->argc > 1)
+               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGCOUNT))
+                       return(0);
+
+       if (MDOC_Split == n->args->argv[0].arg)
+               n->data.An.auth = AUTH_split;
+       else if (MDOC_Nosplit == n->args->argv[0].arg)
+               n->data.An.auth = AUTH_nosplit;
+       else
+               abort();
+
+       return(1);

 }
 
 
 }
 
 


@@ -932,7 +944,7 @@ static int
 post_bf(POST_ARGS)
 {
        struct mdoc_node *np;
 post_bf(POST_ARGS)
 {
        struct mdoc_node *np;

-       int               arg;
+       enum mdocargt     arg;

 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD
 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD


@@ -1076,16 +1088,14 @@ post_at(POST_ARGS)
 static int
 post_an(POST_ARGS)
 {
 static int
 post_an(POST_ARGS)
 {

+       struct mdoc_node *np;

 
 

-       if (mdoc->last->args) {
-               if (NULL == mdoc->last->child)
-                       return(1);
-               return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGCOUNT));
-       }
-
-       if (mdoc->last->child)
+       np = mdoc->last;
+       if (AUTH__NONE != np->data.An.auth && np->child)
+               return(mdoc_nmsg(mdoc, np, MANDOCERR_ARGCOUNT));
+       if (AUTH__NONE != np->data.An.auth || np->child)

                return(1);
                return(1);

-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS));
+       return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS));

 }
 
 
 }
 
 


@@ -1127,9 +1137,6 @@ post_it(POST_ARGS)
                if (NULL == mdoc->last->head->child)
                        if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))
                                return(0);
                if (NULL == mdoc->last->head->child)
                        if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))
                                return(0);

-               if (NULL == mdoc->last->body->child)
-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-                               return(0);

                break;
        case (LIST_bullet):
                /* FALLTHROUGH */
                break;
        case (LIST_bullet):
                /* FALLTHROUGH */


@@ -1138,24 +1145,18 @@ post_it(POST_ARGS)
        case (LIST_enum):
                /* FALLTHROUGH */
        case (LIST_hyphen):
        case (LIST_enum):
                /* FALLTHROUGH */
        case (LIST_hyphen):

+               if (NULL == mdoc->last->body->child)
+                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
+                               return(0);

                /* FALLTHROUGH */
        case (LIST_item):
                if (mdoc->last->head->child)
                        if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))
                                return(0);
                /* FALLTHROUGH */
        case (LIST_item):
                if (mdoc->last->head->child)
                        if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))
                                return(0);

-               if (NULL == mdoc->last->body->child)
-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-                               return(0);

                break;
        case (LIST_column):
                break;
        case (LIST_column):

-               cols = -1;
-               for (i = 0; i < (int)n->args->argc; i++)
-                       if (MDOC_Column == n->args->argv[i].arg) {
-                               cols = (int)n->args->argv[i].sz;
-                               break;
-                       }
+               cols = (int)n->data.Bl->ncols;

 
 

-               assert(-1 != cols);

                assert(NULL == mdoc->last->head->child);
 
                if (NULL == mdoc->last->body->child)
                assert(NULL == mdoc->last->head->child);
 
                if (NULL == mdoc->last->body->child)


@@ -1195,12 +1196,7 @@ post_bl_head(POST_ARGS)
        n = mdoc->last->parent;
 
        if (LIST_column == n->data.Bl->type) {
        n = mdoc->last->parent;
 
        if (LIST_column == n->data.Bl->type) {

-               for (i = 0; i < (int)n->args->argc; i++)
-                       if (MDOC_Column == n->args->argv[i].arg)
-                               break;
-               assert(i < (int)n->args->argc);
-
-               if (n->args->argv[i].sz && mdoc->last->nchild) {
+               if (n->data.Bl->ncols && mdoc->last->nchild) {

                        mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);
                        return(0);
                }
                        mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);
                        return(0);
                }