From 2e846fb2760d20d374d5d18bb041cca4ea94b612 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Wed, 13 Apr 2011 09:57:41 +0000
Subject: Remove TODO from prior commit of lifting warnings from `Sh', `Ss',
 `SH', and `SS' bodies.

---
 TODO   |  7 -------
 roff.c | 57 ++++++++++++++++++++++++---------------------------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/TODO b/TODO
index 603a88ec..7bbc2b28 100644
--- a/TODO
+++ b/TODO
@@ -320,13 +320,6 @@
 * error reporting issues
 ************************************************************************
 
-- In man(7), an empty subsection (.SS) should not be an error, probably
-  not even a warning.  For example, in ExtUtils::CChecker(3p), this is
-  used in a way similar to empty .It -tag in mdoc(7), that is, explaining
-  two commands (both presented with .SS markup) in one paragraph of text.
-  Reported by Gleydson Soares <gsoares at trusted dot com dot br>
-  on ports@  Tue, 12 Apr 2011 15:39:26 -0300
-
 ************************************************************************
 * performance issues
 ************************************************************************
diff --git a/roff.c b/roff.c
index 4789f7c8..c86bb31a 100644
--- a/roff.c
+++ b/roff.c
@@ -277,10 +277,6 @@ roffnode_pop(struct roff *r)
 	assert(r->last);
 	p = r->last; 
 
-	if (ROFF_el == p->tok)
-		if (r->rstackpos > -1)
-			r->rstackpos--;
-
 	r->last = r->last->parent;
 	free(p->name);
 	free(p->end);
@@ -976,29 +972,20 @@ roff_cond(ROFF_ARGS)
 	int		 sv;
 	enum roffrule	 rule;
 
-	/* Stack overflow! */
-
-	if (ROFF_ie == tok && r->rstackpos == RSTACK_MAX - 1) {
-		mandoc_msg(MANDOCERR_MEM, r->parse, ln, ppos, NULL);
-		return(ROFF_ERR);
-	}
-
-	/* First, evaluate the conditional. */
+	/* 
+	 * An `.el' has no conditional body: it will consume the value
+	 * of the current rstack entry set in prior `ie' calls or
+	 * defaults to DENY.  
+	 *
+	 * If we're not an `el', however, then evaluate the conditional.
+	 */
 
-	if (ROFF_el == tok) {
-		/* 
-		 * An `.el' will get the value of the current rstack
-		 * entry set in prior `ie' calls or defaults to DENY.
-	 	 */
-		if (r->rstackpos < 0)
-			rule = ROFFRULE_DENY;
-		else
-			rule = r->rstack[r->rstackpos];
-	} else
-		rule = roff_evalcond(*bufp, &pos);
+	rule = ROFF_el == tok ?
+		(r->rstackpos < 0 ? 
+		 ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
+		roff_evalcond(*bufp, &pos);
 
 	sv = pos;
-
 	while (' ' == (*bufp)[pos])
 		pos++;
 
@@ -1018,16 +1005,20 @@ roff_cond(ROFF_ARGS)
 
 	r->last->rule = rule;
 
+	/*
+	 * An if-else will put the NEGATION of the current evaluated
+	 * conditional into the stack of rules.
+	 */
+
 	if (ROFF_ie == tok) {
-		/*
-		 * An if-else will put the NEGATION of the current
-		 * evaluated conditional into the stack.
-		 */
-		r->rstackpos++;
-		if (ROFFRULE_DENY == r->last->rule)
-			r->rstack[r->rstackpos] = ROFFRULE_ALLOW;
-		else
-			r->rstack[r->rstackpos] = ROFFRULE_DENY;
+		if (r->rstackpos == RSTACK_MAX - 1) {
+			mandoc_msg(MANDOCERR_MEM, 
+				r->parse, ln, ppos, NULL);
+			return(ROFF_ERR);
+		}
+		r->rstack[++r->rstackpos] = 
+			ROFFRULE_DENY == r->last->rule ?
+			ROFFRULE_ALLOW : ROFFRULE_DENY;
 	}
 
 	/* If the parent has false as its rule, then so do we. */
-- 
cgit