Move .sp to the roff modules. Enough infrastructure is in place

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index ad8206b65bc928ed2f67975807ba8f1d98ea2bc1..ee74da7d13b19659952fcb310f51a23d845d4832 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,7 +1,7 @@
 /*     $OpenBSD$ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -48,14 +48,12 @@ static      void      check_text(CHKARGS);
 static void      post_AT(CHKARGS);
 static void      post_IP(CHKARGS);
 static void      post_vs(CHKARGS);
-static void      post_ft(CHKARGS);
 static void      post_OP(CHKARGS);
 static void      post_TH(CHKARGS);
 static void      post_UC(CHKARGS);
 static void      post_UR(CHKARGS);
 
-static v_check man_valids[MAN_MAX] = {
-       post_vs,    /* br */
+static const v_check __man_valids[MAN_MAX - MAN_TH] = {
        post_TH,    /* TH */
        NULL,       /* SH */
        NULL,       /* SS */
@@ -76,7 +74,6 @@ static        v_check man_valids[MAN_MAX] = {
        NULL,       /* I */
        NULL,       /* IR */
        NULL,       /* RI */
-       post_vs,    /* sp */
        NULL,       /* nf */
        NULL,       /* fi */
        NULL,       /* RE */
@@ -86,21 +83,20 @@ static      v_check man_valids[MAN_MAX] = {
        NULL,       /* PD */
        post_AT,    /* AT */
        NULL,       /* in */
-       post_ft,    /* ft */
        post_OP,    /* OP */
        NULL,       /* EX */
        NULL,       /* EE */
        post_UR,    /* UR */
        NULL,       /* UE */
-       NULL,       /* ll */
 };
+static const v_check *man_valids = __man_valids - MAN_TH;
 
 
 void
 man_node_validate(struct roff_man *man)
 {
        struct roff_node *n;
-       v_check         *cp;
+       const v_check    *cp;
 
        n = man->last;
        man->last = man->last->child;
@@ -125,6 +121,19 @@ man_node_validate(struct roff_man *man)
        case ROFFT_TBL:
                break;
        default:
+               if (n->tok < ROFF_MAX) {
+                       switch (n->tok) {
+                       case ROFF_br:
+                       case ROFF_sp:
+                               post_vs(man, n);
+                               break;
+                       default:
+                               roff_validate(man);
+                               break;
+                       }
+                       break;
+               }
+               assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
                cp = man_valids + n->tok;
                if (*cp)
                        (*cp)(man, n);
@@ -180,10 +189,10 @@ static void
 post_OP(CHKARGS)
 {
 
-       if (n->nchild == 0)
+       if (n->child == NULL)
                mandoc_msg(MANDOCERR_OP_EMPTY, man->parse,
                    n->line, n->pos, "OP");
-       else if (n->nchild > 2) {
+       else if (n->child->next != NULL && n->child->next->next != NULL) {
                n = n->child->next->next;
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
                    n->line, n->pos, "OP ... %s", n->string);
@@ -200,54 +209,13 @@ post_UR(CHKARGS)
        check_part(man, n);
 }
 
-static void
-post_ft(CHKARGS)
-{
-       char    *cp;
-       int      ok;
-
-       if (0 == n->nchild)
-               return;
-
-       ok = 0;
-       cp = n->child->string;
-       switch (*cp) {
-       case '1':
-       case '2':
-       case '3':
-       case '4':
-       case 'I':
-       case 'P':
-       case 'R':
-               if ('\0' == cp[1])
-                       ok = 1;
-               break;
-       case 'B':
-               if ('\0' == cp[1] || ('I' == cp[1] && '\0' == cp[2]))
-                       ok = 1;
-               break;
-       case 'C':
-               if ('W' == cp[1] && '\0' == cp[2])
-                       ok = 1;
-               break;
-       default:
-               break;
-       }
-
-       if (0 == ok) {
-               mandoc_vmsg(MANDOCERR_FT_BAD, man->parse,
-                   n->line, n->pos, "ft %s", cp);
-               *cp = '\0';
-       }
-}
-
 static void
 check_part(CHKARGS)
 {
 
        if (n->type == ROFFT_BODY && n->child == NULL)
                mandoc_msg(MANDOCERR_BLK_EMPTY, man->parse,
-                   n->line, n->pos, man_macronames[n->tok]);
+                   n->line, n->pos, roff_name[n->tok]);
 }
 
 static void
@@ -256,22 +224,21 @@ check_par(CHKARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               if (0 == n->body->nchild)
+               if (n->body->child == NULL)
                        roff_node_delete(man, n);
                break;
        case ROFFT_BODY:
-               if (0 == n->nchild)
+               if (n->child == NULL)
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            man->parse, n->line, n->pos,
-                           "%s empty", man_macronames[n->tok]);
+                           "%s empty", roff_name[n->tok]);
                break;
        case ROFFT_HEAD:
-               if (n->nchild)
+               if (n->child != NULL)
                        mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                           man->parse, n->line, n->pos,
-                           "%s %s%s", man_macronames[n->tok],
-                           n->child->string,
-                           n->nchild > 1 ? " ..." : "");
+                           man->parse, n->line, n->pos, "%s %s%s",
+                           roff_name[n->tok], n->child->string,
+                           n->child->next != NULL ? " ..." : "");
                break;
        default:
                break;
@@ -284,14 +251,14 @@ post_IP(CHKARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               if (0 == n->head->nchild && 0 == n->body->nchild)
+               if (n->head->child == NULL && n->body->child == NULL)
                        roff_node_delete(man, n);
                break;
        case ROFFT_BODY:
-               if (0 == n->parent->head->nchild && 0 == n->nchild)
+               if (n->parent->head->child == NULL && n->child == NULL)
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            man->parse, n->line, n->pos,
-                           "%s empty", man_macronames[n->tok]);
+                           "%s empty", roff_name[n->tok]);
                break;
        default:
                break;
@@ -478,9 +445,12 @@ post_vs(CHKARGS)
        switch (n->parent->tok) {
        case MAN_SH:
        case MAN_SS:
+       case MAN_PP:
+       case MAN_LP:
+       case MAN_P:
                mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
-                   "%s after %s", man_macronames[n->tok],
-                   man_macronames[n->parent->tok]);
+                   "%s after %s", roff_name[n->tok],
+                   roff_name[n->parent->tok]);
                /* FALLTHROUGH */
        case TOKEN_NONE:
                /*