=================================================================== RCS file: /cvs/mandoc/Attic/mdoctree.c,v retrieving revision 1.1 retrieving revision 1.6 diff -u -p -r1.1 -r1.6 --- mandoc/Attic/mdoctree.c 2009/02/21 21:00:06 1.1 +++ mandoc/Attic/mdoctree.c 2009/03/08 14:01:46 1.6 @@ -1,4 +1,4 @@ - /* $Id: mdoctree.c,v 1.1 2009/02/21 21:00:06 kristaps Exp $ */ + /* $Id: mdoctree.c,v 1.6 2009/03/08 14:01:46 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,276 +16,136 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -#include -#include - #include -#include #include #include #include #include -#include -#include -#include "mdoc.h" +#include "mmain.h" -#define MD_LINE_SZ (256) /* Max input line size. */ +#define xprintf (void)printf -struct md_parse { - int warn; /* Warning flags. */ -#define MD_WARN_SYNTAX (1 << 0) /* Show syntax warnings. */ -#define MD_WARN_COMPAT (1 << 1) /* Show compat warnings. */ -#define MD_WARN_ALL (0x03) /* Show all warnings. */ -#define MD_WARN_ERR (1 << 2) /* Make warnings->errors. */ - int dbg; /* Debug level. */ - struct mdoc *mdoc; /* Active parser. */ - char *buf; /* Input buffer. */ - u_long bufsz; /* Input buffer size. */ - char *in; /* Input file name. */ - int fdin; /* Input file desc. */ -}; +static void doprint(const struct mdoc_node *, int); -extern char *__progname; - -static void usage(void); -static int getsopts(struct md_parse *, char *); -static int parse(struct md_parse *); -static void msg_msg(void *, int, int, const char *); -static int msg_err(void *, int, int, const char *); -static int msg_warn(void *, int, int, - enum mdoc_warn, const char *); - -extern void treeprint(const struct mdoc_node *, - const struct mdoc_meta *); - -#ifdef __linux__ -extern int getsubopt(char **, char *const *, char **); -#endif - int main(int argc, char *argv[]) { - struct md_parse p; - struct mdoc_cb cb; - struct stat st; - int c; - extern char *optarg; - extern int optind; + struct mmain *p; + int c; + const struct mdoc *mdoc; - (void)memset(&p, 0, sizeof(struct md_parse)); + p = mmain_alloc(); - while (-1 != (c = getopt(argc, argv, "vW:"))) - switch (c) { - case ('v'): - p.dbg++; - break; - case ('W'): - if ( ! getsopts(&p, optarg)) - return(0); - break; - default: - usage(); - return(0); - } + c = mmain_getopt(p, argc, argv, NULL, NULL, NULL, NULL); + if (1 != c) + mmain_exit(p, -1 == c ? 1 : 0); - argv += optind; - argc -= optind; + if (NULL == (mdoc = mmain_mdoc(p))) + mmain_exit(p, 1); - /* Initialise the input file. */ - - p.in = "-"; - p.fdin = STDIN_FILENO; - - if (argc > 0) { - p.in = *argv++; - p.fdin = open(p.in, O_RDONLY, 0); - if (-1 == p.fdin) - err(1, "%s", p.in); - } - - /* Allocate a buffer to be BUFSIZ/block size. */ - - if (-1 == fstat(p.fdin, &st)) { - warn("%s", p.in); - p.bufsz = BUFSIZ; - } else - p.bufsz = MAX(st.st_blksize, BUFSIZ); - - p.buf = malloc(p.bufsz); - if (NULL == p.buf) - err(1, "malloc"); - - /* Allocate the parser. */ - - cb.mdoc_err = msg_err; - cb.mdoc_warn = msg_warn; - cb.mdoc_msg = msg_msg; - - p.mdoc = mdoc_alloc(&p, &cb); - - /* Parse the input file. */ - - c = parse(&p); - free(p.buf); - - if (STDIN_FILENO != p.fdin && -1 == close(p.fdin)) - warn("%s", p.in); - - if (0 == c) { - mdoc_free(p.mdoc); - return(EXIT_FAILURE); - } - - /* If the parse succeeded, print it out. */ - - treeprint(mdoc_node(p.mdoc), mdoc_meta(p.mdoc)); - mdoc_free(p.mdoc); - - return(EXIT_SUCCESS); + doprint(mdoc_node(mdoc), 0); + mmain_exit(p, 0); + /* NOTREACHED */ } -static int -getsopts(struct md_parse *p, char *arg) +static void +doprint(const struct mdoc_node *n, int indent) { - char *v; - char *toks[] = { "all", "compat", - "syntax", "error", NULL }; + const char *p, *t; + int i, j; + size_t argc, sz; + char **params; + struct mdoc_argv *argv; - while (*arg) - switch (getsubopt(&arg, toks, &v)) { - case (0): - p->warn |= MD_WARN_ALL; - break; - case (1): - p->warn |= MD_WARN_COMPAT; - break; - case (2): - p->warn |= MD_WARN_SYNTAX; - break; - case (3): - p->warn |= MD_WARN_ERR; - break; - default: - usage(); - return(0); - } + argv = NULL; + argc = sz = 0; + params = NULL; - return(1); -} + switch (n->type) { + case (MDOC_ROOT): + t = "root"; + break; + case (MDOC_BLOCK): + t = "block"; + break; + case (MDOC_HEAD): + t = "block-head"; + break; + case (MDOC_BODY): + t = "block-body"; + break; + case (MDOC_TAIL): + t = "block-tail"; + break; + case (MDOC_ELEM): + t = "elem"; + break; + case (MDOC_TEXT): + t = "text"; + break; + default: + abort(); + /* NOTREACHED */ + } - -static int -parse(struct md_parse *p) -{ - ssize_t sz, i; - size_t pos; - char line[MD_LINE_SZ]; - int lnn; - - /* - * This is a little more complicated than fgets. TODO: have - * some benchmarks that show it's faster (note that I want to - * check many, many manuals simultaneously, so speed is - * important). Fill a buffer (sized to the block size) with a - * single read, then parse \n-terminated lines into a line - * buffer, which is passed to the parser. Hard-code the line - * buffer to a particular size -- a reasonable assumption. - */ - - for (lnn = 1, pos = 0; ; ) { - if (-1 == (sz = read(p->fdin, p->buf, p->bufsz))) { - warn("%s", p->in); - return(0); - } else if (0 == sz) - break; - - for (i = 0; i < sz; i++) { - if ('\n' != p->buf[i]) { - if (pos < sizeof(line)) { - line[(int)pos++] = p->buf[(int)i]; - continue; - } - warnx("%s: line %d too long", p->in, lnn); - return(0); - } - - line[(int)pos] = 0; - if ( ! mdoc_parseln(p->mdoc, lnn, line)) - return(0); - - lnn++; - pos = 0; + switch (n->type) { + case (MDOC_TEXT): + p = n->string; + break; + case (MDOC_BODY): + p = mdoc_macronames[n->tok]; + break; + case (MDOC_HEAD): + p = mdoc_macronames[n->tok]; + break; + case (MDOC_TAIL): + p = mdoc_macronames[n->tok]; + break; + case (MDOC_ELEM): + p = mdoc_macronames[n->tok]; + if (n->args) { + argv = n->args->argv; + argc = n->args->argc; } + break; + case (MDOC_BLOCK): + p = mdoc_macronames[n->tok]; + if (n->args) { + argv = n->args->argv; + argc = n->args->argc; + } + break; + case (MDOC_ROOT): + p = "root"; + break; + default: + abort(); + /* NOTREACHED */ } - return(mdoc_endparse(p->mdoc)); -} + for (i = 0; i < indent; i++) + xprintf(" "); + xprintf("%s (%s)", p, t); - -static int -msg_err(void *arg, int line, int col, const char *msg) -{ - struct md_parse *p; - - p = (struct md_parse *)arg; - - warnx("%s:%d: error: %s (column %d)", - p->in, line, msg, col); - return(0); -} - - -static void -msg_msg(void *arg, int line, int col, const char *msg) -{ - struct md_parse *p; - - p = (struct md_parse *)arg; - - if (0 == p->dbg) - return; - - warnx("%s:%d: debug: %s (column %d)", - p->in, line, msg, col); -} - - -static int -msg_warn(void *arg, int line, int col, - enum mdoc_warn type, const char *msg) -{ - struct md_parse *p; - - p = (struct md_parse *)arg; - - switch (type) { - case (WARN_COMPAT): - if (p->warn & MD_WARN_COMPAT) - break; - return(1); - case (WARN_SYNTAX): - if (p->warn & MD_WARN_SYNTAX) - break; - return(1); + for (i = 0; i < (int)argc; i++) { + xprintf(" -%s", mdoc_argnames[argv[i].arg]); + if (argv[i].sz > 0) + xprintf(" ["); + for (j = 0; j < (int)argv[i].sz; j++) + xprintf(" [%s]", argv[i].value[j]); + if (argv[i].sz > 0) + xprintf(" ]"); } - warnx("%s:%d: warning: %s (column %d)", - p->in, line, msg, col); + for (i = 0; i < (int)sz; i++) + xprintf(" [%s]", params[i]); - if ( ! (p->warn & MD_WARN_ERR)) - return(1); + xprintf(" %d:%d\n", n->line, n->pos); - warnx("%s: considering warnings as errors", __progname); - return(0); + if (n->child) + doprint(n->child, indent + 1); + if (n->next) + doprint(n->next, indent); } - - -static void -usage(void) -{ - - warnx("usage: %s [-v] [-Wwarn...] [infile]", __progname); -} -