Delete the function mparse_readmem() that has been unused for almost a

[mandoc.git] / roff_validate.c

diff --git a/roff_validate.c b/roff_validate.c
index 269de1c42fddaa4e3fdaf21fe97072e0be7e7f21..3a53022ac35bb13f961effa3a79b8b085d8ec14c 100644 (file)
--- a/roff_validate.c
+++ b/roff_validate.c
@@ -1,6 +1,6 @@
-/*     $OpenBSD: roff_html.c,v 1.1 2017/05/04 22:07:44 schwarze Exp $ */
+/*     $Id: roff_validate.c,v 1.13 2018/12/14 01:18:26 schwarze Exp $ */
 /*
- * Copyright (c) 2010, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2017, 2018 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
@@ -17,7 +17,8 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "mandoc.h"
 #include "roff.h"
@@ -28,11 +29,21 @@
 
 typedef        void    (*roff_valid_fp)(ROFF_VALID_ARGS);
 
+static void      roff_valid_br(ROFF_VALID_ARGS);
 static void      roff_valid_ft(ROFF_VALID_ARGS);
+static void      roff_valid_sp(ROFF_VALID_ARGS);
 
 static const roff_valid_fp roff_valids[ROFF_MAX] = {
-       NULL,  /* br */
+       roff_valid_br,  /* br */
+       NULL,  /* ce */
        roff_valid_ft,  /* ft */
+       NULL,  /* ll */
+       NULL,  /* mc */
+       NULL,  /* po */
+       NULL,  /* rj */
+       roff_valid_sp,  /* sp */
+       NULL,  /* ta */
+       NULL,  /* ti */
 };
 
 
@@ -47,10 +58,43 @@ roff_validate(struct roff_man *man)
                (*roff_valids[n->tok])(man, n);
 }
 
+static void
+roff_valid_br(ROFF_VALID_ARGS)
+{
+       struct roff_node        *np;
+
+       if (n->child != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_SKIP, man->parse,
+                   n->line, n->pos, "br %s", n->child->string);
+
+       if (n->next != NULL && n->next->type == ROFFT_TEXT &&
+           *n->next->string == ' ') {
+               mandoc_msg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
+                   "br before text line with leading blank");
+               roff_node_delete(man, n);
+               return;
+       }
+
+       if ((np = n->prev) == NULL)
+               return;
+
+       switch (np->tok) {
+       case ROFF_br:
+       case ROFF_sp:
+       case MDOC_Pp:
+               mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse,
+                   n->line, n->pos, "br after %s", roff_name[np->tok]);
+               roff_node_delete(man, n);
+               break;
+       default:
+               break;
+       }
+}
+
 static void
 roff_valid_ft(ROFF_VALID_ARGS)
 {
-       char    *cp;
+       const char              *cp;
 
        if (n->child == NULL) {
                man->next = ROFF_NEXT_CHILD;
@@ -76,7 +120,8 @@ roff_valid_ft(ROFF_VALID_ARGS)
                        return;
                break;
        case 'C':
-               if (cp[1] == 'W' && cp[2] == '\0')
+               if (cp[1] != '\0' && cp[2] == '\0' &&
+                   strchr("BIRW", cp[1]) != NULL)
                        return;
                break;
        default:
@@ -87,3 +132,32 @@ roff_valid_ft(ROFF_VALID_ARGS)
            n->line, n->pos, "ft %s", cp);
        roff_node_delete(man, n);
 }
+
+static void
+roff_valid_sp(ROFF_VALID_ARGS)
+{
+       struct roff_node        *np;
+
+       if (n->child != NULL && n->child->next != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
+                   n->child->next->line, n->child->next->pos,
+                   "sp ... %s", n->child->next->string);
+
+       if ((np = n->prev) == NULL)
+               return;
+
+       switch (np->tok) {
+       case ROFF_br:
+               mandoc_msg(MANDOCERR_PAR_SKIP, man->parse,
+                   np->line, np->pos, "br before sp");
+               roff_node_delete(man, np);
+               break;
+       case MDOC_Pp:
+               mandoc_msg(MANDOCERR_PAR_SKIP, man->parse,
+                   n->line, n->pos, "sp after Pp");
+               roff_node_delete(man, n);
+               break;
+       default:
+               break;
+       }
+}