From 3c7b73a2f8774480e0df1984d751f9ead2c8c29d Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Fri, 21 Aug 2009 12:12:12 +0000 Subject: Open explicit scope on libman exit now only generates warning. Consecutive ELINE scopes are now pruned (with a warning). --- man.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'man.c') diff --git a/man.c b/man.c index 6cac5884..f1c461e6 100644 --- a/man.c +++ b/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.33 2009/08/20 11:51:07 kristaps Exp $ */ +/* $Id: man.c,v 1.34 2009/08/21 12:12:12 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -454,8 +454,9 @@ descope: int man_pmacro(struct man *m, int ln, char *buf) { - int i, j, c, ppos, fl; - char mac[5]; + int i, j, c, ppos, fl; + char mac[5]; + struct man_node *n; /* Comments and empties are quickly ignored. */ @@ -512,6 +513,29 @@ man_pmacro(struct man *m, int ln, char *buf) while (buf[i] && ' ' == buf[i]) i++; + /* Remove prior ELINE macro, if applicable. */ + + if (m->flags & MAN_ELINE) { + n = m->last; + assert(NULL == n->child); + if ( ! man_nwarn(m, n, WLNSCOPE)) + return(0); + + if (n->prev) { + assert(n != n->parent->child); + assert(n == n->prev->next); + n->prev->next = NULL; + m->last = n->prev; + } else { + assert(n == n->parent->child); + n->parent->child = NULL; + m->last = n->parent; + } + + man_node_free(n); + m->flags &= ~MAN_ELINE; + } + /* Begin recursive parse sequence. */ assert(man_macros[c].fp); @@ -533,8 +557,6 @@ out: /* Close out the block scope opened in the prior line. */ - /* XXX - this should be in man_action.c. */ - assert(MAN_BLINE & m->flags); m->flags &= ~MAN_BLINE; -- cgit v1.2.3