From 56bf7e8b9228994f0a7e6486d7dc6ce9ff9fb51d Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 21 Oct 2015 23:51:11 +0000 Subject: Move all mdoc(7) node validation done before child parsing to the new separate validation pass, except for a tiny bit needed by the parser which goes to the new mdoc_state() module; cleaner, simpler, and surprisingly also shorter by 15 lines. --- roff.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) (limited to 'roff.c') diff --git a/roff.c b/roff.c index 12853cad..59207bdf 100644 --- a/roff.c +++ b/roff.c @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.281 2015/10/20 02:01:32 schwarze Exp $ */ +/* $Id: roff.c,v 1.282 2015/10/21 23:51:11 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons * Copyright (c) 2010-2015 Ingo Schwarze @@ -1025,47 +1025,31 @@ roff_node_append(struct roff_man *man, struct roff_node *n) abort(); } n->parent->nchild++; - - /* - * Copy over the normalised-data pointer of our parent. Not - * everybody has one, but copying a null pointer is fine. - */ - - switch (n->type) { - case ROFFT_BODY: - if (n->end != ENDBODY_NOT) - break; - /* FALLTHROUGH */ - case ROFFT_TAIL: - case ROFFT_HEAD: - n->norm = n->parent->norm; - break; - default: - break; - } - - if (man->macroset == MACROSET_MDOC) - mdoc_valid_pre(man, n); + man->last = n; switch (n->type) { case ROFFT_HEAD: - assert(n->parent->type == ROFFT_BLOCK); n->parent->head = n; break; case ROFFT_BODY: - if (n->end) - break; - assert(n->parent->type == ROFFT_BLOCK); + if (n->end != ENDBODY_NOT) + return; n->parent->body = n; break; case ROFFT_TAIL: - assert(n->parent->type == ROFFT_BLOCK); n->parent->tail = n; break; default: - break; + return; } - man->last = n; + + /* + * Copy over the normalised-data pointer of our parent. Not + * everybody has one, but copying a null pointer is fine. + */ + + n->norm = n->parent->norm; + assert(n->parent->type == ROFFT_BLOCK); } void -- cgit v1.2.3