In order to become able to generate syntax tree nodes on the roff(7)

level, validation must be separated from parsing and rewinding.
This first big step moves calling of the mdoc(7) post_*() functions
out of the parser loop into their own mdoc_validate() pass, while
using a new mdoc_state() module to make syntax tree state handling
available to both the parser loop and the validation pass.

1 files changed, 11 insertions, 20 deletions

diff --git a/mdoc.c b/mdoc.c
index a6509722..12f126f5 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.254 2015/10/12 00:08:15 schwarze Exp $ */
+/*	$Id: mdoc.c,v 1.255 2015/10/20 02:01:31 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -121,24 +121,6 @@ mdoc_macro(MACRO_PROT_ARGS)
 {
 	assert(tok > TOKEN_NONE && tok < MDOC_MAX);
 
-	if (mdoc->flags & MDOC_PBODY) {
-		if (tok == MDOC_Dt) {
-			mandoc_vmsg(MANDOCERR_DT_LATE,
-			    mdoc->parse, line, ppos,
-			    "Dt %s", buf + *pos);
-			return;
-		}
-	} else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
-		if (mdoc->meta.title == NULL) {
-			mandoc_vmsg(MANDOCERR_DT_NOTITLE,
-			    mdoc->parse, line, ppos, "%s %s",
-			    mdoc_macronames[tok], buf + *pos);
-			mdoc->meta.title = mandoc_strdup("UNTITLED");
-		}
-		if (NULL == mdoc->meta.vol)
-			mdoc->meta.vol = mandoc_strdup("LOCAL");
-		mdoc->flags |= MDOC_PBODY;
-	}
 	(*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
 }
 
@@ -319,8 +301,8 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
 		 * behaviour that we want to work around it.
 		 */
 		roff_elem_alloc(mdoc, line, offs, MDOC_sp);
+		mdoc->last->flags |= MDOC_VALID | MDOC_ENDED;
 		mdoc->next = ROFF_NEXT_SIBLING;
-		mdoc_valid_post(mdoc);
 		return 1;
 	}
 
@@ -495,3 +477,12 @@ mdoc_isdelim(const char *p)
 
 	return DELIM_NONE;
 }
+
+void
+mdoc_validate(struct roff_man *mdoc)
+{
+
+	mdoc->last = mdoc->first;
+	mdoc_node_validate(mdoc);
+	mdoc_state_reset(mdoc);
+}