=================================================================== RCS file: /cvs/mandoc/tree.c,v retrieving revision 1.10 retrieving revision 1.29 diff -u -p -r1.10 -r1.29 --- mandoc/tree.c 2009/03/23 15:20:51 1.10 +++ mandoc/tree.c 2011/01/01 22:27:08 1.29 @@ -1,49 +1,58 @@ -/* $Id: tree.c,v 1.10 2009/03/23 15:20:51 kristaps Exp $ */ +/* $Id: tree.c,v 1.29 2011/01/01 22:27:08 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * 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. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include -#include #include #include +#include +#include "mandoc.h" #include "mdoc.h" #include "man.h" +#include "main.h" -static void tree_mdoc(const struct mdoc_node *, int); -static void tree_man(const struct man_node *, int); +static void print_mdoc(const struct mdoc_node *, int); +static void print_man(const struct man_node *, int); +static void print_span(const struct tbl_span *); /* ARGSUSED */ -int -tree_run(void *arg, const struct man *man, - const struct mdoc *mdoc) +void +tree_mdoc(void *arg, const struct mdoc *mdoc) { - if (man) - tree_man(man_node(man), 0); - if (mdoc) - tree_mdoc(mdoc_node(mdoc), 0); - return(1); + print_mdoc(mdoc_node(mdoc), 0); } +/* ARGSUSED */ +void +tree_man(void *arg, const struct man *man) +{ + + print_man(man_node(man), 0); +} + + static void -tree_mdoc(const struct mdoc_node *n, int indent) +print_mdoc(const struct mdoc_node *n, int indent) { const char *p, *t; int i, j; @@ -66,7 +75,10 @@ tree_mdoc(const struct mdoc_node *n, int indent) 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"; @@ -77,11 +89,16 @@ tree_mdoc(const struct mdoc_node *n, int indent) case (MDOC_TEXT): t = "text"; break; + case (MDOC_TBL): + t = "tbl"; + break; default: abort(); /* NOTREACHED */ } + p = NULL; + switch (n->type) { case (MDOC_TEXT): p = n->string; @@ -109,6 +126,8 @@ tree_mdoc(const struct mdoc_node *n, int indent) argc = n->args->argc; } break; + case (MDOC_TBL): + break; case (MDOC_ROOT): p = "root"; break; @@ -118,33 +137,41 @@ tree_mdoc(const struct mdoc_node *n, int indent) } for (i = 0; i < indent; i++) - (void)printf(" "); - (void)printf("%s (%s)", p, t); + putchar('\t'); - for (i = 0; i < (int)argc; i++) { - (void)printf(" -%s", mdoc_argnames[argv[i].arg]); - if (argv[i].sz > 0) - (void)printf(" ["); - for (j = 0; j < (int)argv[i].sz; j++) - (void)printf(" [%s]", argv[i].value[j]); - if (argv[i].sz > 0) - (void)printf(" ]"); - } + if (n->span) { + assert(NULL == p); + print_span(n->span); + } else { + printf("%s (%s)", p, t); - for (i = 0; i < (int)sz; i++) - (void)printf(" [%s]", params[i]); + for (i = 0; i < (int)argc; i++) { + printf(" -%s", mdoc_argnames[argv[i].arg]); + if (argv[i].sz > 0) + printf(" ["); + for (j = 0; j < (int)argv[i].sz; j++) + printf(" [%s]", argv[i].value[j]); + if (argv[i].sz > 0) + printf(" ]"); + } + + for (i = 0; i < (int)sz; i++) + printf(" [%s]", params[i]); - (void)printf(" %d:%d\n", n->line, n->pos); + printf(" %d:%d", n->line, n->pos); + } + putchar('\n'); + if (n->child) - tree_mdoc(n->child, indent + 1); + print_mdoc(n->child, indent + 1); if (n->next) - tree_mdoc(n->next, indent); + print_mdoc(n->next, indent); } static void -tree_man(const struct man_node *n, int indent) +print_man(const struct man_node *n, int indent) { const char *p, *t; int i; @@ -159,32 +186,100 @@ tree_man(const struct man_node *n, int indent) 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; + case (MAN_TBL): + t = "tbl"; + break; default: abort(); /* NOTREACHED */ } + p = NULL; + 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; + case (MAN_TBL): + 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); + putchar('\t'); + if (n->span) { + assert(NULL == p); + print_span(n->span); + } else + printf("%s (%s) %d:%d", p, t, n->line, n->pos); + + putchar('\n'); + if (n->child) - tree_man(n->child, indent + 1); + print_man(n->child, indent + 1); if (n->next) - tree_man(n->next, indent); + print_man(n->next, indent); +} + +static void +print_span(const struct tbl_span *sp) +{ + const struct tbl_dat *dp; + + printf("tbl: "); + + switch (sp->pos) { + case (TBL_SPAN_HORIZ): + putchar('-'); + return; + case (TBL_SPAN_DHORIZ): + putchar('='); + return; + default: + break; + } + + for (dp = sp->first; dp; dp = dp->next) { + switch (dp->pos) { + case (TBL_DATA_HORIZ): + /* FALLTHROUGH */ + case (TBL_DATA_NHORIZ): + putchar('-'); + continue; + case (TBL_DATA_DHORIZ): + /* FALLTHROUGH */ + case (TBL_DATA_NDHORIZ): + putchar('='); + continue; + default: + break; + } + printf("[%s%s]", dp->string, dp->layout ? "" : "*"); + if (dp->next) + putchar(' '); + } }