Fixed my breaking of Ingo's eoln-whitespace detection code, where a

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 4776445e7dc66a82c207bb018f5bc92f3c9c8f3d..00ad2ef9986d26bdb2044c7de1bb154bbf80e101 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.29 2010/03/22 05:59:32 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.42 2010/05/25 12:44:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
+#include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
 
@@ -49,18 +50,19 @@ static      int       check_part(CHKARGS);
 static int       check_root(CHKARGS);
 static int       check_sec(CHKARGS);
 static int       check_text(CHKARGS);
+static int       check_title(CHKARGS);
 
 static v_check   posts_eq0[] = { check_eq0, NULL };
-static v_check   posts_ge2_le5[] = { check_ge2, check_le5, NULL };
+static v_check   posts_th[] = { check_ge2, check_le5, check_title, NULL };
 static v_check   posts_par[] = { check_par, NULL };
 static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };
-static v_check   posts_sp[] = { check_le1, NULL };
+static v_check   posts_le1[] = { check_le1, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
 
 static const struct man_valid man_valids[MAN_MAX] = {
        { NULL, posts_eq0 }, /* br */
-       { pres_bline, posts_ge2_le5 }, /* TH */ /* FIXME: make sure capitalised. */
+       { pres_bline, posts_th }, /* TH */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */
        { pres_bline, posts_par }, /* TP */
@@ -82,7 +84,7 @@ static        const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* RI */
        { NULL, posts_eq0 }, /* na */
        { NULL, NULL }, /* i */
-       { NULL, posts_sp }, /* sp */
+       { NULL, posts_le1 }, /* sp */
        { pres_bline, posts_eq0 }, /* nf */
        { pres_bline, posts_eq0 }, /* fi */
        { NULL, NULL }, /* r */
@@ -91,6 +93,10 @@ static       const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* DT */
        { NULL, NULL }, /* UC */
        { NULL, NULL }, /* PD */
+       { NULL, posts_le1 }, /* Sp */
+       { pres_bline, posts_le1 }, /* Vb */
+       { pres_bline, posts_eq0 }, /* Ve */
+       { NULL, NULL }, /* AT */
 };
 
 
@@ -146,17 +152,50 @@ check_root(CHKARGS)
 {
 
        if (MAN_BLINE & m->flags)
-               return(man_nwarn(m, n, WEXITSCOPE));
+               return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
        if (MAN_ELINE & m->flags)
-               return(man_nwarn(m, n, WEXITSCOPE));
+               return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
 
        m->flags &= ~MAN_BLINE;
        m->flags &= ~MAN_ELINE;
 
-       if (NULL == m->first->child)
-               return(man_nerr(m, n, WNODATA));
-       if (NULL == m->meta.title)
-               return(man_nerr(m, n, WNOTITLE));
+       if (NULL == m->first->child) {
+               man_nmsg(m, n, MANDOCERR_NODOCBODY);
+               return(0);
+       } else if (NULL == m->meta.title) {
+               if ( ! man_nmsg(m, n, MANDOCERR_NOTITLE))
+                       return(0);
+               /*
+                * If a title hasn't been set, do so now (by
+                * implication, date and section also aren't set).
+                * 
+                * FIXME: this should be in man_action.c.
+                */
+               m->meta.title = mandoc_strdup("unknown");
+               m->meta.date = time(NULL);
+               m->meta.msec = mandoc_strdup("1");
+       }
+
+       return(1);
+}
+
+
+static int
+check_title(CHKARGS) 
+{
+       const char      *p;
+
+       assert(n->child);
+       /* FIXME: is this sufficient? */
+       if ('\0' == *n->child->string) {
+               man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
+               return(0);
+       }
+
+       for (p = n->child->string; '\0' != *p; p++)
+               if (isalpha((u_char)*p) && ! isupper((u_char)*p))
+                       if ( ! man_nmsg(m, n, MANDOCERR_UPPERCASE))
+                               return(0);
 
        return(1);
 }
@@ -178,19 +217,16 @@ check_text(CHKARGS)
                                pos += c - 1;
                                continue;
                        }
-                       if ( ! (MAN_IGN_ESCAPE & m->pflags))
-                               return(man_perr(m, n->line, pos, WESCAPE));
-                       if ( ! man_pwarn(m, n->line, pos, WESCAPE))
-                               return(0);
-                       continue;
+
+                       c = man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
+                       if ( ! (MAN_IGN_ESCAPE & m->pflags) && ! c)
+                               return(c);
                }
 
-               if ('\t' == *p || isprint((u_char)*p)) 
+               if ('\t' == *p || isprint((u_char)*p) || ASCII_HYPH == *p) 
                        continue;
-
-               if (MAN_IGN_CHARS & m->pflags)
-                       return(man_pwarn(m, n->line, pos, WNPRINT));
-               return(man_perr(m, n->line, pos, WNPRINT));
+               if ( ! man_pmsg(m, n->line, pos, MANDOCERR_BADCHAR))
+                       return(0);
        }
 
        return(1);
@@ -203,9 +239,10 @@ check_##name(CHKARGS) \
 { \
        if (n->nchild ineq (x)) \
                return(1); \
-       return(man_verr(m, n->line, n->pos, \
-                       "expected line arguments %s %d, have %d", \
-                       #ineq, (x), n->nchild)); \
+       man_vmsg(m, MANDOCERR_SYNTARGCOUNT, n->line, n->pos, \
+                       "line arguments %s %d (have %d)", \
+                       #ineq, (x), n->nchild); \
+       return(0); \
 }
 
 INEQ_DEFINE(0, ==, eq0)
@@ -218,10 +255,12 @@ static int
 check_sec(CHKARGS)
 {
 
-       if (MAN_BODY == n->type && 0 == n->nchild)
-               return(man_nwarn(m, n, WBODYARGS));
-       if (MAN_HEAD == n->type && 0 == n->nchild)
-               return(man_nerr(m, n, WHEADARGS));
+       if (MAN_HEAD == n->type && 0 == n->nchild) {
+               man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
+               return(0);
+       } else if (MAN_BODY == n->type && 0 == n->nchild)
+               return(man_nmsg(m, n, MANDOCERR_NOBODY));
+
        return(1);
 }
 
@@ -231,7 +270,7 @@ check_part(CHKARGS)
 {
 
        if (MAN_BODY == n->type && 0 == n->nchild)
-               return(man_nwarn(m, n, WBODYARGS));
+               return(man_nmsg(m, n, MANDOCERR_NOBODY));
        return(1);
 }
 
@@ -252,7 +291,7 @@ check_par(CHKARGS)
                default:
                        if (n->nchild)
                                break;
-                       return(man_nwarn(m, n, WBODYARGS));
+                       return(man_nmsg(m, n, MANDOCERR_NOBODY));
                }
        if (MAN_HEAD == n->type)
                switch (n->tok) {
@@ -263,11 +302,11 @@ check_par(CHKARGS)
                case (MAN_LP):
                        if (0 == n->nchild)
                                break;
-                       return(man_nwarn(m, n, WNHEADARGS));
+                       return(man_nmsg(m, n, MANDOCERR_ARGSLOST));
                default:
                        if (n->nchild)
                                break;
-                       return(man_nwarn(m, n, WHEADARGS));
+                       return(man_nmsg(m, n, MANDOCERR_NOARGS));
                }
 
        return(1);
@@ -279,8 +318,11 @@ check_bline(CHKARGS)
 {
 
        assert( ! (MAN_ELINE & m->flags));
-       if (MAN_BLINE & m->flags)
-               return(man_nerr(m, n, WLNSCOPE));
+       if (MAN_BLINE & m->flags) {
+               man_nmsg(m, n, MANDOCERR_SYNTLINESCOPE);
+               return(0);
+       }
+
        return(1);
 }