From 571ad544e3f91be23bf5a43de5da97988eb96df7 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 15 Jan 2009 15:46:45 +0000 Subject: *** empty log message *** --- mdoc.c | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) (limited to 'mdoc.c') diff --git a/mdoc.c b/mdoc.c index 2994c737..e22ef3cc 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.29 2009/01/14 11:58:24 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.30 2009/01/15 15:46:45 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -393,7 +393,7 @@ mdoc_macro(struct mdoc *mdoc, int tok, static int mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) { - const char *on, *ot, *act; + const char *nn, *nt, *on, *ot, *act; assert(mdoc->last); assert(mdoc->first); @@ -406,33 +406,15 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) else on = mdoc_macronames[mdoc->last->tok]; - /* FIXME: put this into util.c. */ - switch (mdoc->last->type) { - case (MDOC_TEXT): - ot = "text"; - break; - case (MDOC_BODY): - ot = "body"; - break; - case (MDOC_ELEM): - ot = "elem"; - break; - case (MDOC_HEAD): - ot = "head"; - break; - case (MDOC_TAIL): - ot = "tail"; - break; - case (MDOC_BLOCK): - ot = "block"; - break; - case (MDOC_ROOT): - ot = "root"; - break; - default: - abort(); - /* NOTREACHED */ - } + if (MDOC_TEXT == p->type) + nn = ""; + else if (MDOC_ROOT == p->type) + nn = ""; + else + nn = mdoc_macronames[p->tok]; + + ot = mdoc_type2a(mdoc->last->type); + nt = mdoc_type2a(p->type); switch (mdoc->next) { case (MDOC_NEXT_SIBLING): @@ -474,7 +456,8 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) } mdoc->last = p; - mdoc_msg(mdoc, "parse: %s of %s `%s'", act, ot, on); + mdoc_msg(mdoc, "parse: %s `%s' %s of %s `%s'", + nt, nn, act, ot, on); return(1); } -- cgit v1.2.3