=================================================================== RCS file: /cvs/mandoc/tree.c,v retrieving revision 1.8 retrieving revision 1.56 diff -u -p -r1.8 -r1.56 --- mandoc/tree.c 2009/03/19 16:17:27 1.8 +++ mandoc/tree.c 2014/10/10 08:44:24 1.56 @@ -1,108 +1,133 @@ -/* $Id: tree.c,v 1.8 2009/03/19 16:17:27 kristaps Exp $ */ +/* $Id: tree.c,v 1.56 2014/10/10 08:44:24 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons + * Copyright (c) 2013, 2014 Ingo Schwarze * * 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 "config.h" + +#include + #include -#include +#include #include #include +#include +#include "mandoc.h" #include "mdoc.h" +#include "man.h" +#include "main.h" -static void tree_body(const struct mdoc_node *, int); +static void print_box(const struct eqn_box *, int); +static void print_man(const struct man_node *, int); +static void print_mdoc(const struct mdoc_node *, int); +static void print_span(const struct tbl_span *, int); -int -tree_run(void *arg, const struct mdoc *mdoc) +void +tree_mdoc(void *arg, const struct mdoc *mdoc) { - tree_body(mdoc_node(mdoc), 0); - return(1); + print_mdoc(mdoc_node(mdoc), 0); } +void +tree_man(void *arg, const struct man *man) +{ + print_man(man_node(man), 0); +} + static void -tree_body(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; + size_t argc; struct mdoc_argv *argv; argv = NULL; - argc = sz = 0; - params = NULL; + argc = 0; + t = p = NULL; switch (n->type) { - case (MDOC_ROOT): + case MDOC_ROOT: t = "root"; break; - case (MDOC_BLOCK): + case MDOC_BLOCK: t = "block"; break; - case (MDOC_HEAD): + case MDOC_HEAD: t = "block-head"; break; - case (MDOC_BODY): - t = "block-body"; + case MDOC_BODY: + if (n->end) + t = "body-end"; + else + t = "block-body"; break; - case (MDOC_TAIL): + case MDOC_TAIL: t = "block-tail"; break; - case (MDOC_ELEM): + case MDOC_ELEM: t = "elem"; break; - case (MDOC_TEXT): + case MDOC_TEXT: t = "text"; break; + case MDOC_TBL: + /* FALLTHROUGH */ + case MDOC_EQN: + break; default: abort(); /* NOTREACHED */ } switch (n->type) { - case (MDOC_TEXT): + case MDOC_TEXT: p = n->string; break; - case (MDOC_BODY): + case MDOC_BODY: p = mdoc_macronames[n->tok]; break; - case (MDOC_HEAD): + case MDOC_HEAD: p = mdoc_macronames[n->tok]; break; - case (MDOC_TAIL): + case MDOC_TAIL: p = mdoc_macronames[n->tok]; break; - case (MDOC_ELEM): + case MDOC_ELEM: p = mdoc_macronames[n->tok]; if (n->args) { argv = n->args->argv; argc = n->args->argc; } break; - case (MDOC_BLOCK): + case MDOC_BLOCK: p = mdoc_macronames[n->tok]; if (n->args) { argv = n->args->argv; argc = n->args->argc; } break; - case (MDOC_ROOT): + case MDOC_TBL: + /* FALLTHROUGH */ + case MDOC_EQN: + break; + case MDOC_ROOT: p = "root"; break; default: @@ -110,28 +135,220 @@ tree_body(const struct mdoc_node *n, int indent) /* NOTREACHED */ } - for (i = 0; i < indent; i++) - (void)printf(" "); - (void)printf("%s (%s)", p, t); + if (n->span) { + assert(NULL == p && NULL == t); + print_span(n->span, indent); + } else if (n->eqn) { + assert(NULL == p && NULL == t); + print_box(n->eqn->root, indent); + } else { + for (i = 0; i < indent; i++) + 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(" ]"); + printf("%s (%s)", p, t); + + 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(" ]"); + } + + putchar(' '); + if (MDOC_LINE & n->flags) + putchar('*'); + printf("%d:%d", n->line, n->pos + 1); + if (n->lastline != n->line) + printf("-%d", n->lastline); + putchar('\n'); } - for (i = 0; i < (int)sz; i++) - (void)printf(" [%s]", params[i]); + if (n->child) + print_mdoc(n->child, indent + 1); + if (n->next) + print_mdoc(n->next, indent); +} - (void)printf(" %d:%d\n", n->line, n->pos); +static void +print_man(const struct man_node *n, int indent) +{ + const char *p, *t; + int i; + t = p = NULL; + + 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; + case MAN_TAIL: + t = "block-tail"; + break; + case MAN_TBL: + /* FALLTHROUGH */ + case MAN_EQN: + 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_TAIL: + /* FALLTHROUGH */ + case MAN_BODY: + p = man_macronames[n->tok]; + break; + case MAN_ROOT: + p = "root"; + break; + case MAN_TBL: + /* FALLTHROUGH */ + case MAN_EQN: + break; + default: + abort(); + /* NOTREACHED */ + } + + if (n->span) { + assert(NULL == p && NULL == t); + print_span(n->span, indent); + } else if (n->eqn) { + assert(NULL == p && NULL == t); + print_box(n->eqn->root, indent); + } else { + for (i = 0; i < indent; i++) + putchar('\t'); + printf("%s (%s) ", p, t); + if (MAN_LINE & n->flags) + putchar('*'); + printf("%d:%d\n", n->line, n->pos + 1); + } + if (n->child) - tree_body(n->child, indent + 1); + print_man(n->child, indent + 1); if (n->next) - tree_body(n->next, indent); + print_man(n->next, indent); } +static void +print_box(const struct eqn_box *ep, int indent) +{ + int i; + const char *t; + + if (NULL == ep) + return; + for (i = 0; i < indent; i++) + putchar('\t'); + + t = NULL; + switch (ep->type) { + case EQN_ROOT: + t = "eqn-root"; + break; + case EQN_LISTONE: + case EQN_LIST: + t = "eqn-list"; + break; + case EQN_SUBEXPR: + t = "eqn-expr"; + break; + case EQN_TEXT: + t = "eqn-text"; + break; + case EQN_PILE: + t = "eqn-pile"; + break; + case EQN_MATRIX: + t = "eqn-matrix"; + break; + } + + assert(t); + printf("%s(size=%d, args=%zu(%zu), pos=%d, font=%d, pile=%d, l=\"%s\", r=\"%s\") %s\n", + t, EQN_DEFSIZE == ep->size ? 0 : ep->size, + ep->args, ep->expectargs, + ep->pos, ep->font, ep->pile, + ep->left ? ep->left : "", + ep->right ? ep->right : "", + ep->text ? ep->text : ""); + + print_box(ep->first, indent + 1); + print_box(ep->next, indent); +} + +static void +print_span(const struct tbl_span *sp, int indent) +{ + const struct tbl_dat *dp; + int i; + + for (i = 0; i < indent; i++) + putchar('\t'); + + 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\"", dp->string ? dp->string : ""); + if (dp->spans) + printf("(%d)", dp->spans); + if (NULL == dp->layout) + putchar('*'); + putchar(']'); + putchar(' '); + } + + printf("(tbl) %d:1\n", sp->line); +}