===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.196
retrieving revision 1.203
diff -u -p -r1.196 -r1.203
--- mandoc/mdoc_macro.c	2015/04/29 14:48:53	1.196
+++ mandoc/mdoc_macro.c	2015/10/12 00:08:15	1.203
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.196 2015/04/29 14:48:53 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.203 2015/10/12 00:08:15 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -243,13 +243,13 @@ lookup(struct roff_man *mdoc, int from, int line, int 
 		res = mdoc_hash_find(p);
 		if (res != TOKEN_NONE) {
 			if (mdoc_macros[res].flags & MDOC_CALLABLE)
-				return(res);
+				return res;
 			if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll)
 				mandoc_msg(MANDOCERR_MACRO_CALL,
 				    mdoc->parse, line, ppos, p);
 		}
 	}
-	return(TOKEN_NONE);
+	return TOKEN_NONE;
 }
 
 /*
@@ -258,12 +258,11 @@ lookup(struct roff_man *mdoc, int from, int line, int 
 static void
 rew_last(struct roff_man *mdoc, const struct roff_node *to)
 {
-	struct roff_node *n, *np;
+	struct roff_node	*np;
 
 	if (to->flags & MDOC_VALID)
 		return;
 
-	mdoc->next = ROFF_NEXT_SIBLING;
 	while (mdoc->last != to) {
 		/*
 		 * Save the parent here, because we may delete the
@@ -273,11 +272,10 @@ rew_last(struct roff_man *mdoc, const struct roff_node
 		 */
 		np = mdoc->last->parent;
 		mdoc_valid_post(mdoc);
-		n = mdoc->last;
 		mdoc->last = np;
 		assert(mdoc->last);
-		mdoc->last->last = n;
 	}
+	mdoc->next = ROFF_NEXT_SIBLING;
 	mdoc_valid_post(mdoc);
 }
 
@@ -331,41 +329,40 @@ rew_alt(int tok)
 {
 	switch (tok) {
 	case MDOC_Ac:
-		return(MDOC_Ao);
+		return MDOC_Ao;
 	case MDOC_Bc:
-		return(MDOC_Bo);
+		return MDOC_Bo;
 	case MDOC_Brc:
-		return(MDOC_Bro);
+		return MDOC_Bro;
 	case MDOC_Dc:
-		return(MDOC_Do);
+		return MDOC_Do;
 	case MDOC_Ec:
-		return(MDOC_Eo);
+		return MDOC_Eo;
 	case MDOC_Ed:
-		return(MDOC_Bd);
+		return MDOC_Bd;
 	case MDOC_Ef:
-		return(MDOC_Bf);
+		return MDOC_Bf;
 	case MDOC_Ek:
-		return(MDOC_Bk);
+		return MDOC_Bk;
 	case MDOC_El:
-		return(MDOC_Bl);
+		return MDOC_Bl;
 	case MDOC_Fc:
-		return(MDOC_Fo);
+		return MDOC_Fo;
 	case MDOC_Oc:
-		return(MDOC_Oo);
+		return MDOC_Oo;
 	case MDOC_Pc:
-		return(MDOC_Po);
+		return MDOC_Po;
 	case MDOC_Qc:
-		return(MDOC_Qo);
+		return MDOC_Qo;
 	case MDOC_Re:
-		return(MDOC_Rs);
+		return MDOC_Rs;
 	case MDOC_Sc:
-		return(MDOC_So);
+		return MDOC_So;
 	case MDOC_Xc:
-		return(MDOC_Xo);
+		return MDOC_Xo;
 	default:
-		return(tok);
+		return tok;
 	}
-	/* NOTREACHED */
 }
 
 static void
@@ -416,7 +413,7 @@ find_pending(struct roff_man *mdoc, int tok, int line,
 			}
 		}
 	}
-	return(irc);
+	return irc;
 }
 
 /*
@@ -511,14 +508,14 @@ macro_or_word(MACRO_PROT_ARGS, int parsed)
 	if (ntok == TOKEN_NONE) {
 		dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE ||
 		    mdoc_macros[tok].flags & MDOC_JOIN);
-		return(0);
+		return 0;
 	} else {
 		if (mdoc_macros[tok].fp == in_line_eoln)
 			rew_elem(mdoc, tok);
 		mdoc_macro(mdoc, ntok, line, ppos, pos, buf);
 		if (tok == TOKEN_NONE)
 			append_delims(mdoc, line, pos, buf);
-		return(1);
+		return 1;
 	}
 }
 
@@ -673,6 +670,8 @@ blk_exp_close(MACRO_PROT_ARGS)
 
 	if (endbody != NULL)
 		n = endbody;
+
+	ntok = TOKEN_NONE;
 	for (j = 0; ; j++) {
 		lastarg = *pos;
 
@@ -700,7 +699,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 	}
 
 	if (n != NULL) {
-		if (n != mdoc->last && n->flags & MDOC_BROKEN) {
+		if (ntok != TOKEN_NONE && n->flags & MDOC_BROKEN) {
 			target = n;
 			do
 				target = target->parent;
@@ -735,15 +734,10 @@ in_line(MACRO_PROT_ARGS)
 
 	switch (tok) {
 	case MDOC_An:
-		/* FALLTHROUGH */
 	case MDOC_Ar:
-		/* FALLTHROUGH */
 	case MDOC_Fl:
-		/* FALLTHROUGH */
 	case MDOC_Mt:
-		/* FALLTHROUGH */
 	case MDOC_Nm:
-		/* FALLTHROUGH */
 	case MDOC_Pa:
 		nc = 1;
 		break;
@@ -947,7 +941,6 @@ blk_full(MACRO_PROT_ARGS)
 			if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
 				switch (tok) {
 				case MDOC_Sh:
-					/* FALLTHROUGH */
 				case MDOC_Ss:
 					mandoc_vmsg(MANDOCERR_BLK_BROKEN,
 					    mdoc->parse, line, ppos,
@@ -1290,16 +1283,12 @@ in_line_argn(MACRO_PROT_ARGS)
 
 	switch (tok) {
 	case MDOC_Ap:
-		/* FALLTHROUGH */
 	case MDOC_Ns:
-		/* FALLTHROUGH */
 	case MDOC_Ux:
 		maxargs = 0;
 		break;
 	case MDOC_Bx:
-		/* FALLTHROUGH */
 	case MDOC_Es:
-		/* FALLTHROUGH */
 	case MDOC_Xr:
 		maxargs = 2;
 		break;
@@ -1397,7 +1386,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 		if (mdoc->next == ROFF_NEXT_SIBLING)
 			n = n->parent;
 		if (n->tok == MDOC_Nm)
-			rew_last(mdoc, mdoc->last->parent);
+			rew_last(mdoc, n->parent);
 	}
 
 	if (buf[*pos] == '\0' &&
@@ -1427,9 +1416,9 @@ parse_rest(struct roff_man *mdoc, int tok, int line, i
 	for (;;) {
 		la = *pos;
 		if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN)
-			return(0);
+			return 0;
 		if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
-			return(1);
+			return 1;
 	}
 }