Fixed a goddamn subtle error causing MDOC_LITERAL to remain set after a

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 02e3bea532e7609d0a27c689ed20327af73dc550..6c0ff01c763b954957ee2a952cba62767b1f3cff 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,38 +1,63 @@
-/* $Id: tree.c,v 1.4 2009/02/20 11:04:23 kristaps Exp $ */
+/*     $Id: tree.c,v 1.24 2010/07/07 15:04:54 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
  */

-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <assert.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <time.h>

 
 

+#include "mandoc.h"

 #include "mdoc.h"
 #include "mdoc.h"

+#include "man.h"
+#include "main.h"
+
+static void    print_mdoc(const struct mdoc_node *, int);
+static void    print_man(const struct man_node *, int);
+
+
+/* ARGSUSED */
+void
+tree_mdoc(void *arg, const struct mdoc *mdoc)
+{
+
+       print_mdoc(mdoc_node(mdoc), 0);
+}
+
+
+/* ARGSUSED */
+void
+tree_man(void *arg, const struct man *man)
+{

 
 

-#define        xprintf         (void)printf
+       print_man(man_node(man), 0);
+}

 
 

-static void     treeprint_r(const struct mdoc_node *, int);

 
 static void
 
 static void

-treeprint_r(const struct mdoc_node *n, int indent)
+print_mdoc(const struct mdoc_node *n, int indent)

 {
        const char       *p, *t;
        int               i, j;
        size_t            argc, sz;
        char            **params;
 {
        const char       *p, *t;
        int               i, j;
        size_t            argc, sz;
        char            **params;

-       struct mdoc_arg  *argv;
+       struct mdoc_argv *argv;

 
        argv = NULL;
        argc = sz = 0;
 
        argv = NULL;
        argc = sz = 0;


@@ -49,7 +74,10 @@ treeprint_r(const struct mdoc_node *n, int indent)
                t = "block-head";
                break;
        case (MDOC_BODY):
                t = "block-head";
                break;
        case (MDOC_BODY):

-               t = "block-body";
+               if (n->end)
+                       t = "body-end";
+               else
+                       t = "block-body";

                break;
        case (MDOC_TAIL):
                t = "block-tail";
                break;
        case (MDOC_TAIL):
                t = "block-tail";


@@ -67,7 +95,7 @@ treeprint_r(const struct mdoc_node *n, int indent)
 
        switch (n->type) {
        case (MDOC_TEXT):
 
        switch (n->type) {
        case (MDOC_TEXT):

-               p = n->data.text.string;
+               p = n->string;

                break;
        case (MDOC_BODY):
                p = mdoc_macronames[n->tok];
                break;
        case (MDOC_BODY):
                p = mdoc_macronames[n->tok];


@@ -80,13 +108,17 @@ treeprint_r(const struct mdoc_node *n, int indent)
                break;
        case (MDOC_ELEM):
                p = mdoc_macronames[n->tok];
                break;
        case (MDOC_ELEM):
                p = mdoc_macronames[n->tok];

-               argv = n->data.elem.argv;
-               argc = n->data.elem.argc;
+               if (n->args) {
+                       argv = n->args->argv;
+                       argc = n->args->argc;
+               }

                break;
        case (MDOC_BLOCK):
                p = mdoc_macronames[n->tok];
                break;
        case (MDOC_BLOCK):
                p = mdoc_macronames[n->tok];

-               argv = n->data.block.argv;
-               argc = n->data.block.argc;
+               if (n->args) {
+                       argv = n->args->argv;
+                       argc = n->args->argc;
+               }

                break;
        case (MDOC_ROOT):
                p = "root";
                break;
        case (MDOC_ROOT):
                p = "root";


@@ -97,35 +129,88 @@ treeprint_r(const struct mdoc_node *n, int indent)
        }
 
        for (i = 0; i < indent; i++)
        }
 
        for (i = 0; i < indent; i++)

-               xprintf("    ");
-       xprintf("%s (%s)", p, t);
+               (void)printf("    ");
+       (void)printf("%s (%s)", p, t);

 
        for (i = 0; i < (int)argc; i++) {
 
        for (i = 0; i < (int)argc; i++) {

-               xprintf(" -%s", mdoc_argnames[argv[i].arg]);
+               (void)printf(" -%s", mdoc_argnames[argv[i].arg]);

                if (argv[i].sz > 0)
                if (argv[i].sz > 0)

-                       xprintf(" [");
+                       (void)printf(" [");

                for (j = 0; j < (int)argv[i].sz; j++)
                for (j = 0; j < (int)argv[i].sz; j++)

-                       xprintf(" [%s]", argv[i].value[j]);
+                       (void)printf(" [%s]", argv[i].value[j]);

                if (argv[i].sz > 0)
                if (argv[i].sz > 0)

-                       xprintf(" ]");
+                       (void)printf(" ]");

        }
 
        for (i = 0; i < (int)sz; i++)
        }
 
        for (i = 0; i < (int)sz; i++)

-               xprintf(" [%s]", params[i]);
+               (void)printf(" [%s]", params[i]);

 
 

-       xprintf(" %d:%d\n", n->line, n->pos);
+       (void)printf(" %d:%d\n", n->line, n->pos);

 
        if (n->child)
 
        if (n->child)

-               treeprint_r(n->child, indent + 1);
+               print_mdoc(n->child, indent + 1);

        if (n->next)
        if (n->next)

-               treeprint_r(n->next, indent);
+               print_mdoc(n->next, indent);

 }
 
 
 }
 
 

-int
-treeprint(const struct mdoc_node *node)
+static void
+print_man(const struct man_node *n, int indent)

 {
 {

+       const char       *p, *t;
+       int               i;
+
+       switch (n->type) {
+       case (MAN_ROOT):
+               t = "root";
+               break;
+       case (MAN_ELEM):
+               t = "elem";
+               break;
+       case (MAN_TEXT):
+               t = "text";
+               break;
+       case (MAN_BLOCK):
+               t = "block";
+               break;
+       case (MAN_HEAD):
+               t = "block-head";
+               break;
+       case (MAN_BODY):
+               t = "block-body";
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       switch (n->type) {
+       case (MAN_TEXT):
+               p = n->string;
+               break;
+       case (MAN_ELEM):
+               /* FALLTHROUGH */
+       case (MAN_BLOCK):
+               /* FALLTHROUGH */
+       case (MAN_HEAD):
+               /* FALLTHROUGH */
+       case (MAN_BODY):
+               p = man_macronames[n->tok];
+               break;
+       case (MAN_ROOT):
+               p = "root";
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       for (i = 0; i < indent; i++)
+               (void)printf("    ");
+       (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);

 
 

-       treeprint_r(node, 0);
-       return(1);
+       if (n->child)
+               print_man(n->child, indent + 1);
+       if (n->next)
+               print_man(n->next, indent);

 }
 }