Moved prologue-pruning into action.c.

[mandoc.git] / validate.c

diff --git a/validate.c b/validate.c
index 5bc05fcf93ebbb6fa1017bd10a52e9e5f77e8d38..b68e6ad9013e8c1bf139e7ec3c6bb7dd90b458e3 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.40 2009/01/19 17:51:33 kristaps Exp $ */
+/* $Id: validate.c,v 1.43 2009/01/20 12:51:28 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,7 +27,6 @@ typedef       int     (*v_post)(struct mdoc *);
 /* FIXME: some sections should only occur in specific msecs. */
 /* FIXME: ignoring Pp. */
 /* FIXME: math symbols. */
-/* FIXME: make sure prologue is complete. */
 /* FIXME: valid character-escape checks. */
 /* FIXME: make sure required sections are included (NAME, ...). */
 
@@ -71,7 +70,7 @@ static        int     pre_prologue(struct mdoc *, struct mdoc_node *);
 /* Specific post-child-parse routines. */
 
 static int     herr_ge1(struct mdoc *);
-static int     hwarn_ge1(struct mdoc *);
+static int     herr_le1(struct mdoc *);
 static int     herr_eq0(struct mdoc *);
 static int     eerr_eq0(struct mdoc *);
 static int     eerr_le1(struct mdoc *);
@@ -81,7 +80,6 @@ static        int     eerr_ge1(struct mdoc *);
 static int     ewarn_eq0(struct mdoc *);
 static int     ewarn_eq1(struct mdoc *);
 static int     bwarn_ge1(struct mdoc *);
-static int     berr_eq0(struct mdoc *);
 static int     ewarn_ge1(struct mdoc *);
 static int     ebool(struct mdoc *);
 static int     post_sh(struct mdoc *);
@@ -92,6 +90,7 @@ static        int     post_an(struct mdoc *);
 static int     post_at(struct mdoc *);
 static int     post_xr(struct mdoc *);
 static int     post_nm(struct mdoc *);
+static int     post_bf(struct mdoc *);
 static int     post_root(struct mdoc *);
 
 /* Collections of pre-child-parse routines. */
@@ -117,19 +116,19 @@ static    v_post  posts_bd[] = { herr_eq0, bwarn_ge1, NULL };
 static v_post  posts_text[] = { eerr_ge1, NULL };
 static v_post  posts_wtext[] = { ewarn_ge1, NULL };
 static v_post  posts_notext[] = { eerr_eq0, NULL };
-static v_post  posts_wline[] = { hwarn_ge1, berr_eq0, NULL };
+static v_post  posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static v_post  posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
 static v_post  posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };
 static v_post  posts_it[] = { post_it, NULL };
 static v_post  posts_in[] = { ewarn_eq1, NULL };
 static v_post  posts_ss[] = { herr_ge1, NULL };
 static v_post  posts_pp[] = { ewarn_eq0, NULL };
-static v_post  posts_d1[] = { herr_ge1, NULL };
 static v_post  posts_ex[] = { eerr_le1, post_ex, NULL };
 static v_post  posts_an[] = { post_an, NULL };
 static v_post  posts_at[] = { post_at, NULL };
 static v_post  posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL };
 static v_post  posts_nm[] = { post_nm, NULL };
+static v_post  posts_bf[] = { herr_le1, post_bf, NULL };
 
 /* Per-macro pre- and post-child-check routine collections. */
 
@@ -142,8 +141,8 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { pres_sh, posts_sh }, /* Sh */ 
        { pres_ss, posts_ss }, /* Ss */ 
        { NULL, posts_pp }, /* Pp */ 
-       { pres_d1, posts_d1 }, /* D1 */
-       { pres_d1, posts_d1 }, /* Dl */
+       { pres_d1, posts_wline }, /* D1 */
+       { pres_d1, posts_wline }, /* Dl */
        { pres_bd, posts_bd }, /* Bd */
        { NULL, NULL }, /* Ed */
        { pres_bl, posts_bl }, /* Bl */ 
@@ -193,7 +192,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, posts_wline }, /* Aq */
        { NULL, posts_at }, /* At */ 
        { NULL, NULL }, /* Bc */
-       { NULL, NULL }, /* Bf */  /* FIXME */
+       { NULL, posts_bf }, /* Bf */
        { NULL, NULL }, /* Bo */
        { NULL, posts_wline }, /* Bq */
        { NULL, NULL }, /* Bsx */
@@ -361,16 +360,6 @@ pre_check_parent(struct mdoc *mdoc, struct mdoc_node *node,
 }
 
 
-static int
-berr_eq0(struct mdoc *mdoc)
-{
-
-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-       return(post_check_children_eq(mdoc, "body children", 0));
-}
-
-
 static int
 bwarn_ge1(struct mdoc *mdoc)
 {
@@ -464,12 +453,11 @@ herr_eq0(struct mdoc *mdoc)
 
 
 static int
-hwarn_ge1(struct mdoc *mdoc)
+herr_le1(struct mdoc *mdoc)
 {
-
        if (MDOC_HEAD != mdoc->last->type)
                return(1);
-       return(post_check_children_wgt(mdoc, "parameters", 0));
+       return(post_check_children_lt(mdoc, "parameters", 2));
 }
 
 
@@ -766,6 +754,40 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 }
 
 
+static int
+post_bf(struct mdoc *mdoc)
+{
+       char             *p;
+       struct mdoc_node *head;
+
+       if (MDOC_BLOCK != mdoc->last->type)
+               return(1);
+       assert(MDOC_Bf == mdoc->last->tok);
+       head = mdoc->last->data.block.head;
+       assert(head);
+
+       if (0 == mdoc->last->data.block.argc) {
+               if (head->child) {
+                       assert(MDOC_TEXT == head->child->type);
+                       p = head->child->data.text.string;
+                       if (xstrcmp(p, "Em"))
+                               return(1);
+                       else if (xstrcmp(p, "Li"))
+                               return(1);
+                       else if (xstrcmp(p, "Sm"))
+                               return(1);
+                       return(mdoc_nerr(mdoc, head->child, "invalid font mode"));
+               }
+               return(mdoc_err(mdoc, "macro expects an argument or parameter"));
+       }
+       if (head->child)
+               return(mdoc_err(mdoc, "macro expects an argument or parameter"));
+       if (1 == mdoc->last->data.block.argc)
+               return(1);
+       return(mdoc_err(mdoc, "macro expects an argument or parameter"));
+}
+
+
 static int
 post_nm(struct mdoc *mdoc)
 {