Make scan for text tokens in a line recursive. This is really only for

the benefit of `Nd', which is the only [to date] node that can consist
of sub-nodes.

diff --git a/makewhatis.c b/makewhatis.c
index 0e041e74b25f33a2584d0ec8d5cc876c03ff55db..d77a206b636973d68515671156a1a2ec5f033107 100644 (file)
--- a/makewhatis.c
+++ b/makewhatis.c
@@ -1,4 +1,4 @@
-/*     $Id: makewhatis.c,v 1.12 2011/07/01 09:11:35 kristaps Exp $ */
+/*     $Id: makewhatis.c,v 1.13 2011/07/01 10:17:24 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -75,6 +75,8 @@ struct        buf {
                          const struct mdoc_node *n, \
                          const struct mdoc_meta *m
 
+static void              buf_appendmdoc(struct buf *, 
+                               const struct mdoc_node *);
 static void              buf_append(struct buf *, const char *);
 static void              buf_appendb(struct buf *, 
                                const void *, size_t);
@@ -524,6 +526,24 @@ buf_append(struct buf *buf, const char *cp)
        buf_appendb(buf, cp, sz + 1);
 }
 
+/*
+ * Recursively add all text from a given node.  
+ * This is optimised for general mdoc nodes in this context, which do
+ * not consist of subexpressions and having a recursive call for n->next
+ * would be wasteful.
+ */
+static void
+buf_appendmdoc(struct buf *buf, const struct mdoc_node *n)
+{
+
+       for ( ; n; n = n->next) {
+               if (n->child)
+                       buf_appendmdoc(buf, n->child);
+               if (MDOC_TEXT == n->type)
+                       buf_append(buf, n->string);
+       }
+}
+
 /* ARGSUSED */
 static void
 pmdoc_An(MDOC_ARGS)
@@ -532,10 +552,7 @@ pmdoc_An(MDOC_ARGS)
        if (SEC_AUTHORS != n->sec)
                return;
 
-       for (n = n->child; n; n = n->next)
-               if (MDOC_TEXT == n->type)
-                       buf_append(buf, n->string);
-
+       buf_appendmdoc(buf, n->child);
        hash_put(hash, buf, TYPE_AUTHOR);
 }
 
@@ -593,10 +610,7 @@ pmdoc_Cd(MDOC_ARGS)
        if (SEC_SYNOPSIS != n->sec)
                return;
 
-       for (n = n->child; n; n = n->next)
-               if (MDOC_TEXT == n->type)
-                       buf_append(buf, n->string);
-
+       buf_appendmdoc(buf, n->child);
        hash_put(hash, buf, TYPE_CONFIG);
 }
 
@@ -729,24 +743,22 @@ pmdoc_Fo(MDOC_ARGS)
 static void
 pmdoc_Nd(MDOC_ARGS)
 {
-       int              first;
        size_t           sz;
-       
-       for (first = 1, n = n->child; n; n = n->next) {
-               if (MDOC_TEXT != n->type)
-                       continue;
 
-               if (first) {
-                       sz = strlen(n->string) + 1;
-                       buf_appendb(dbuf, n->string, sz);
-                       buf_appendb(buf, n->string, sz);
-               } else {
-                       buf_append(dbuf, n->string);
-                       buf_append(buf, n->string);
-               }
+       if (MDOC_BODY != n->type)
+               return;
+       else if (NULL == (n = n->child))
+               return;
 
-               first = 0;
-       }
+       /* FIXME: don't assume this. */
+       assert(MDOC_TEXT == n->type);
+
+       sz = strlen(n->string) + 1;
+       buf_appendb(dbuf, n->string, sz);
+       buf_appendb(buf, n->string, sz);
+       
+       buf_appendmdoc(dbuf, n->next);
+       buf_appendmdoc(buf, n->next);
 
        hash_put(hash, buf, TYPE_DESC);
 }
@@ -759,10 +771,7 @@ pmdoc_Pa(MDOC_ARGS)
        if (SEC_FILES != n->sec)
                return;
        
-       for (n = n->child; n; n = n->next)
-               if (MDOC_TEXT == n->type)
-                       buf_append(buf, n->string);
-
+       buf_appendmdoc(buf, n->child);
        hash_put(hash, buf, TYPE_PATH);
 }
 
@@ -772,9 +781,7 @@ pmdoc_Nm(MDOC_ARGS)
 {
        
        if (SEC_NAME == n->sec) {
-               for (n = n->child; n; n = n->next)
-                       if (MDOC_TEXT == n->type)
-                               buf_append(buf, n->string);
+               buf_appendmdoc(buf, n->child);
                hash_put(hash, buf, TYPE_NAME);
                return;
        } else if (SEC_SYNOPSIS != n->sec || MDOC_HEAD != n->type)
@@ -783,10 +790,7 @@ pmdoc_Nm(MDOC_ARGS)
        if (NULL == n->child)
                buf_append(buf, m->name);
 
-       for (n = n->child; n; n = n->next)
-               if (MDOC_TEXT == n->type)
-                       buf_append(buf, n->string);
-
+       buf_appendmdoc(buf, n->child);
        hash_put(hash, buf, TYPE_UTILITY);
 }