=================================================================== RCS file: /cvs/mandoc/tree.c,v retrieving revision 1.37 retrieving revision 1.53 diff -u -p -r1.37 -r1.53 --- mandoc/tree.c 2011/03/23 12:33:01 1.37 +++ mandoc/tree.c 2014/07/02 07:10:38 1.53 @@ -1,6 +1,7 @@ -/* $Id: tree.c,v 1.37 2011/03/23 12:33:01 kristaps Exp $ */ +/* $Id: tree.c,v 1.53 2014/07/02 07:10:38 schwarze 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 @@ -19,6 +20,7 @@ #endif #include +#include #include #include #include @@ -28,12 +30,12 @@ #include "man.h" #include "main.h" -static void print_mdoc(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); -/* ARGSUSED */ void tree_mdoc(void *arg, const struct mdoc *mdoc) { @@ -41,8 +43,6 @@ tree_mdoc(void *arg, const struct mdoc *mdoc) print_mdoc(mdoc_node(mdoc), 0); } - -/* ARGSUSED */ void tree_man(void *arg, const struct man *man) { @@ -50,91 +50,84 @@ tree_man(void *arg, const struct man *man) print_man(man_node(man), 0); } - static void 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): + 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): - t = "tbl"; + case MDOC_TBL: + /* FALLTHROUGH */ + case MDOC_EQN: break; - case (MDOC_EQN): - t = "eqn"; - break; default: abort(); /* NOTREACHED */ } - p = NULL; - 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_TBL): + case MDOC_TBL: + /* FALLTHROUGH */ + case MDOC_EQN: break; - case (MDOC_EQN): - p = n->eqn->data; - break; - case (MDOC_ROOT): + case MDOC_ROOT: p = "root"; break; default: @@ -143,8 +136,11 @@ print_mdoc(const struct mdoc_node *n, int indent) } if (n->span) { - assert(NULL == p); + 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'); @@ -160,102 +156,103 @@ print_mdoc(const struct mdoc_node *n, int indent) if (argv[i].sz > 0) printf(" ]"); } - - for (i = 0; i < (int)sz; i++) - printf(" [%s]", params[i]); - printf(" %d:%d", n->line, n->pos); + 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'); } - putchar('\n'); - if (n->child) print_mdoc(n->child, indent + 1); if (n->next) print_mdoc(n->next, indent); } - 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): + case MAN_ROOT: t = "root"; break; - case (MAN_ELEM): + case MAN_ELEM: t = "elem"; break; - case (MAN_TEXT): + case MAN_TEXT: t = "text"; break; - case (MAN_BLOCK): + case MAN_BLOCK: t = "block"; break; - case (MAN_HEAD): + case MAN_HEAD: t = "block-head"; break; - case (MAN_BODY): + case MAN_BODY: t = "block-body"; break; - case (MAN_TAIL): + case MAN_TAIL: t = "block-tail"; break; - case (MAN_TBL): - t = "tbl"; + case MAN_TBL: + /* FALLTHROUGH */ + case MAN_EQN: break; - case (MAN_EQN): - t = "eqn"; - break; default: abort(); /* NOTREACHED */ } - p = NULL; - switch (n->type) { - case (MAN_TEXT): + case MAN_TEXT: p = n->string; break; - case (MAN_ELEM): + case MAN_ELEM: /* FALLTHROUGH */ - case (MAN_BLOCK): + case MAN_BLOCK: /* FALLTHROUGH */ - case (MAN_HEAD): + case MAN_HEAD: /* FALLTHROUGH */ - case (MAN_TAIL): + case MAN_TAIL: /* FALLTHROUGH */ - case (MAN_BODY): + case MAN_BODY: p = man_macronames[n->tok]; break; - case (MAN_ROOT): + case MAN_ROOT: p = "root"; break; - case (MAN_TBL): + case MAN_TBL: + /* FALLTHROUGH */ + case MAN_EQN: break; - case (MAN_EQN): - p = n->eqn->data; - break; default: abort(); /* NOTREACHED */ } if (n->span) { - assert(NULL == p); + 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) %d:%d", p, t, n->line, n->pos); + printf("%s (%s) ", p, t); + if (MAN_LINE & n->flags) + putchar('*'); + printf("%d:%d\n", n->line, n->pos + 1); } - putchar('\n'); - if (n->child) print_man(n->child, indent + 1); if (n->next) @@ -263,6 +260,48 @@ print_man(const struct man_node *n, int 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_LIST: + t = "eqn-list"; + break; + case EQN_SUBEXPR: + t = "eqn-expr"; + break; + case EQN_TEXT: + t = "eqn-text"; + break; + case EQN_MATRIX: + t = "eqn-matrix"; + break; + } + + assert(t); + printf("%s(%d, %d, %d, %d, %d, \"%s\", \"%s\") %s\n", + t, EQN_DEFSIZE == ep->size ? 0 : ep->size, + ep->pos + 1, ep->font, ep->mark, 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; @@ -272,10 +311,10 @@ print_span(const struct tbl_span *sp, int indent) putchar('\t'); switch (sp->pos) { - case (TBL_SPAN_HORIZ): + case TBL_SPAN_HORIZ: putchar('-'); return; - case (TBL_SPAN_DHORIZ): + case TBL_SPAN_DHORIZ: putchar('='); return; default: @@ -284,14 +323,14 @@ print_span(const struct tbl_span *sp, int indent) for (dp = sp->first; dp; dp = dp->next) { switch (dp->pos) { - case (TBL_DATA_HORIZ): + case TBL_DATA_HORIZ: /* FALLTHROUGH */ - case (TBL_DATA_NHORIZ): + case TBL_DATA_NHORIZ: putchar('-'); continue; - case (TBL_DATA_DHORIZ): + case TBL_DATA_DHORIZ: /* FALLTHROUGH */ - case (TBL_DATA_NDHORIZ): + case TBL_DATA_NDHORIZ: putchar('='); continue; default: @@ -306,5 +345,5 @@ print_span(const struct tbl_span *sp, int indent) putchar(' '); } - printf("(tbl) %d:1", sp->line); + printf("(tbl) %d:1\n", sp->line); }