===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.133
retrieving revision 1.138
diff -u -p -r1.133 -r1.138
--- mandoc/man_validate.c	2017/07/26 10:33:34	1.133
+++ mandoc/man_validate.c	2018/12/03 21:00:10	1.138
@@ -1,7 +1,7 @@
-/*	$OpenBSD: man_validate.c,v 1.133 2017/07/26 10:33:34 schwarze Exp $ */
+/*	$OpenBSD: man_validate.c,v 1.138 2018/12/03 21:00:10 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-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
@@ -40,6 +40,7 @@
 
 typedef	void	(*v_check)(CHKARGS);
 
+static	void	  check_abort(CHKARGS);
 static	void	  check_par(CHKARGS);
 static	void	  check_part(CHKARGS);
 static	void	  check_root(CHKARGS);
@@ -54,14 +55,15 @@ static	void	  post_UR(CHKARGS);
 static	void	  post_in(CHKARGS);
 static	void	  post_vs(CHKARGS);
 
-static	const v_check __man_valids[MAN_MAX - MAN_TH] = {
+static	const v_check man_valids[MAN_MAX - MAN_TH] = {
 	post_TH,    /* TH */
 	NULL,       /* SH */
 	NULL,       /* SS */
 	NULL,       /* TP */
-	check_par,  /* LP */
+	NULL,       /* TQ */
+	check_abort,/* LP */
 	check_par,  /* PP */
-	check_par,  /* P */
+	check_abort,/* P */
 	post_IP,    /* IP */
 	NULL,       /* HP */
 	NULL,       /* SM */
@@ -84,6 +86,8 @@ static	const v_check __man_valids[MAN_MAX - MAN_TH] = 
 	NULL,       /* PD */
 	post_AT,    /* AT */
 	post_in,    /* in */
+	NULL,       /* SY */
+	NULL,       /* YS */
 	post_OP,    /* OP */
 	NULL,       /* EX */
 	NULL,       /* EE */
@@ -92,16 +96,35 @@ static	const v_check __man_valids[MAN_MAX - MAN_TH] = 
 	post_UR,    /* MT */
 	NULL,       /* ME */
 };
-static	const v_check *man_valids = __man_valids - MAN_TH;
 
 
+/* Validate the subtree rooted at man->last. */
 void
 man_node_validate(struct roff_man *man)
 {
 	struct roff_node *n;
 	const v_check	 *cp;
 
+	/*
+	 * Translate obsolete macros such that later code
+	 * does not need to look for them.
+	 */
+
 	n = man->last;
+	switch (n->tok) {
+	case MAN_LP:
+	case MAN_P:
+		n->tok = MAN_PP;
+		break;
+	default:
+		break;
+	}
+
+	/*
+	 * Iterate over all children, recursing into each one
+	 * in turn, depth-first.
+	 */
+
 	man->last = man->last->child;
 	while (man->last != NULL) {
 		man_node_validate(man);
@@ -111,6 +134,8 @@ man_node_validate(struct roff_man *man)
 			man->last = man->last->next;
 	}
 
+	/* Finally validate the macro itself. */
+
 	man->last = n;
 	man->next = ROFF_NEXT_SIBLING;
 	switch (n->type) {
@@ -120,6 +145,7 @@ man_node_validate(struct roff_man *man)
 	case ROFFT_ROOT:
 		check_root(man, n);
 		break;
+	case ROFFT_COMMENT:
 	case ROFFT_EQN:
 	case ROFFT_TBL:
 		break;
@@ -137,7 +163,7 @@ man_node_validate(struct roff_man *man)
 			break;
 		}
 		assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
-		cp = man_valids + n->tok;
+		cp = man_valids + (n->tok - MAN_TH);
 		if (*cp)
 			(*cp)(man, n);
 		if (man->last == n)
@@ -149,10 +175,9 @@ man_node_validate(struct roff_man *man)
 static void
 check_root(CHKARGS)
 {
-
 	assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 
-	if (NULL == man->first->child)
+	if (n->last == NULL || n->last->type == ROFFT_COMMENT)
 		mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
 		    n->line, n->pos, NULL);
 	else
@@ -181,6 +206,12 @@ check_root(CHKARGS)
 }
 
 static void
+check_abort(CHKARGS)
+{
+	abort();
+}
+
+static void
 check_text(CHKARGS)
 {
 	char		*cp, *p;
@@ -475,8 +506,6 @@ post_vs(CHKARGS)
 	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", roff_name[n->tok],
 		    roff_name[n->parent->tok]);