=================================================================== RCS file: /cvs/mandoc/Attic/mdocml.c,v retrieving revision 1.35 retrieving revision 1.41 diff -u -p -r1.35 -r1.41 --- mandoc/Attic/mdocml.c 2009/01/05 17:57:08 1.35 +++ mandoc/Attic/mdocml.c 2009/01/12 16:39:57 1.41 @@ -1,4 +1,4 @@ -/* $Id: mdocml.c,v 1.35 2009/01/05 17:57:08 kristaps Exp $ */ +/* $Id: mdocml.c,v 1.41 2009/01/12 16:39:57 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -57,7 +57,7 @@ static int buf_leave(struct md_parse *, int); static int msg_err(void *, int, int, enum mdoc_err); static int msg_warn(void *, int, int, enum mdoc_warn); -static void msg_msg(void *, int, const char *); +static void msg_msg(void *, int, int, const char *); #ifdef __linux__ extern int getsubopt(char **, char *const *, char **); @@ -192,6 +192,7 @@ print_node(const struct mdoc_node *n, int indent) params = NULL; sz = 0; + /* FIXME: put parts of this in util.c. */ switch (n->type) { case (MDOC_TEXT): assert(NULL == n->child); @@ -199,31 +200,33 @@ print_node(const struct mdoc_node *n, int indent) t = "text"; break; case (MDOC_BODY): - p = mdoc_macronames[n->data.body.tok]; + p = mdoc_macronames[n->tok]; t = "block-body"; break; case (MDOC_HEAD): - p = mdoc_macronames[n->data.head.tok]; + p = mdoc_macronames[n->tok]; t = "block-head"; break; case (MDOC_TAIL): - p = mdoc_macronames[n->data.tail.tok]; + p = mdoc_macronames[n->tok]; t = "block-tail"; break; case (MDOC_ELEM): - p = mdoc_macronames[n->data.elem.tok]; + p = mdoc_macronames[n->tok]; t = "element"; argv = n->data.elem.argv; argc = n->data.elem.argc; - params = n->data.elem.args; - sz = n->data.elem.sz; break; case (MDOC_BLOCK): - p = mdoc_macronames[n->data.block.tok]; + p = mdoc_macronames[n->tok]; t = "block"; argv = n->data.block.argv; argc = n->data.block.argc; break; + case (MDOC_ROOT): + p = "root"; + t = "root"; + break; default: abort(); /* NOTREACHED */ @@ -235,14 +238,18 @@ print_node(const struct mdoc_node *n, int indent) for (i = 0; i < (int)argc; i++) { (void)printf(" -%s", mdoc_argnames[argv[i].arg]); + if (j > 0) + (void)printf(" ["); for (j = 0; j < (int)argv[i].sz; j++) - (void)printf(" \"%s\"", argv[i].value[j]); + (void)printf(" [%s]", argv[i].value[j]); + if (j > 0) + (void)printf(" ]"); } for (i = 0; i < (int)sz; i++) - (void)printf(" \"%s\"", params[i]); + (void)printf(" [%s]", params[i]); - (void)printf("\n"); + (void)printf(" %d:%d\n", n->line, n->pos); if (n->child) print_node(n->child, indent + 1); @@ -256,11 +263,16 @@ parse_leave(struct md_parse *p, int code) { const struct mdoc_node *n; - if (p->mdoc) { - if ((n = mdoc_result(p->mdoc))) - print_node(n, 0); - mdoc_free(p->mdoc); - } + if (NULL == p->mdoc) + return(code); + + if ( ! mdoc_endparse(p->mdoc)) + code = 0; + if ((n = mdoc_result(p->mdoc))) + print_node(n, 0); + + mdoc_free(p->mdoc); + return(code); } @@ -304,7 +316,7 @@ parse_begin(struct md_parse *p) } line[(int)pos] = sv[(int)pos] = 0; - if ( ! mdoc_parseln(p->mdoc, line)) + if ( ! mdoc_parseln(p->mdoc, p->lnn, line)) return(parse_leave(p, 0)); p->lnn++; @@ -317,15 +329,14 @@ parse_begin(struct md_parse *p) static int -msg_err(void *arg, int tok, int col, enum mdoc_err type) +msg_err(void *arg, int line, int col, enum mdoc_err type) { - char *fmt, *lit; + char *lit; struct md_parse *p; - int i; p = (struct md_parse *)arg; - fmt = lit = NULL; + lit = NULL; switch (type) { case (ERR_SYNTAX_NOTEXT): @@ -341,56 +352,59 @@ msg_err(void *arg, int tok, int col, enum mdoc_err typ lit = "syntax: whitespace in argument"; break; case (ERR_SYNTAX_ARGFORM): - fmt = "syntax: macro `%s' arguments malformed"; + lit = "syntax: macro arguments malformed"; break; case (ERR_SYNTAX_NOPUNCT): - fmt = "syntax: macro `%s' doesn't understand punctuation"; + lit = "syntax: macro doesn't understand punctuation"; break; case (ERR_SYNTAX_ARG): - fmt = "syntax: unknown argument for macro `%s'"; + lit = "syntax: unknown argument for macro"; break; case (ERR_SCOPE_BREAK): /* Which scope is broken? */ - fmt = "scope: macro `%s' breaks prior explicit scope"; + lit = "scope: macro breaks prior explicit scope"; break; case (ERR_SCOPE_NOCTX): - fmt = "scope: closure macro `%s' has no context"; + lit = "scope: closure macro has no context"; break; case (ERR_SCOPE_NONEST): - fmt = "scope: macro `%s' may not be nested in the current context"; + lit = "scope: macro may not be nested in the current context"; break; case (ERR_MACRO_NOTSUP): lit = "macro not supported"; break; case (ERR_MACRO_NOTCALL): - fmt = "macro `%s' not callable"; + lit = "macro not callable"; break; case (ERR_SEC_PROLOGUE): - fmt = "macro `%s' cannot be called in the prologue"; + lit = "macro cannot be called in the prologue"; break; case (ERR_SEC_NPROLOGUE): - fmt = "macro `%s' called outside of prologue"; + lit = "macro called outside of prologue"; break; case (ERR_ARGS_EQ0): - fmt = "macro `%s' expects zero arguments"; + lit = "macro expects zero arguments"; break; case (ERR_ARGS_EQ1): - fmt = "macro `%s' expects one argument"; + lit = "macro expects one argument"; break; case (ERR_ARGS_GE1): - fmt = "macro `%s' expects one or more arguments"; + lit = "macro expects one or more arguments"; break; case (ERR_ARGS_LE2): - fmt = "macro `%s' expects two or fewer arguments"; + lit = "macro expects two or fewer arguments"; break; + case (ERR_ARGS_LE8): + lit = "macro expects eight or fewer arguments"; + break; case (ERR_ARGS_MANY): - fmt = "macro `%s' has too many arguments"; + lit = "macro has too many arguments"; break; case (ERR_SEC_PROLOGUE_OO): - fmt = "prologue macro `%s' is out-of-order"; + lit = "prologue macro is out-of-order"; break; case (ERR_SEC_PROLOGUE_REP): - fmt = "prologue macro `%s' repeated"; + lit = "prologue macro repeated"; break; case (ERR_SEC_NAME): lit = "`NAME' section must be first"; @@ -399,11 +413,20 @@ msg_err(void *arg, int tok, int col, enum mdoc_err typ lit = "syntax: expected value for macro argument"; break; case (ERR_SYNTAX_ARGBAD): - lit = "syntax: invalid value for macro argument"; + lit = "syntax: invalid value(s) for macro argument"; break; + case (ERR_SYNTAX_ARGMISS): + lit = "syntax: missing required argument(s) for macro"; + break; case (ERR_SYNTAX_ARGMANY): lit = "syntax: too many values for macro argument"; break; + case (ERR_SYNTAX_CHILDBAD): + lit = "syntax: invalid child for parent macro"; + break; + case (ERR_SYNTAX_PARENTBAD): + lit = "syntax: invalid parent for macro"; + break; case (ERR_SYNTAX_CHILDHEAD): lit = "syntax: expected only block-header section"; break; @@ -421,67 +444,32 @@ msg_err(void *arg, int tok, int col, enum mdoc_err typ /* NOTREACHED */ } - if (fmt) { - (void)fprintf(stderr, "%s:%d: error: ", - p->name, p->lnn); - (void)fprintf(stderr, fmt, mdoc_macronames[tok]); - } else - (void)fprintf(stderr, "%s:%d: error: %s", - p->name, p->lnn, lit); - - if (p->dbg < 1) { - if (-1 != col) - (void)fprintf(stderr, " (column %d)\n", col); - return(0); - } else if (-1 == col) { - (void)fprintf(stderr, "\nFrom: %s", p->line); - return(0); - } - - (void)fprintf(stderr, "\nFrom: %s\n ", p->line); - for (i = 0; i < col; i++) - (void)fprintf(stderr, " "); - (void)fprintf(stderr, "^\n"); - + (void)fprintf(stderr, "%s:%d: error: %s (column %d)\n", + p->name, line, lit, col); return(0); } static void -msg_msg(void *arg, int col, const char *msg) +msg_msg(void *arg, int line, int col, const char *msg) { struct md_parse *p; - int i; p = (struct md_parse *)arg; if (p->dbg < 2) return; - (void)printf("%s:%d: %s", p->name, p->lnn, msg); - - if (p->dbg < 3) { - if (-1 != col) - (void)printf(" (column %d)\n", col); - return; - } else if (-1 == col) { - (void)printf("\nFrom %s\n", p->line); - return; - } - - (void)printf("\nFrom: %s\n ", p->line); - for (i = 0; i < col; i++) - (void)printf(" "); - (void)printf("^\n"); + (void)printf("%s:%d: %s (column %d)\n", + p->name, line, msg, col); } static int -msg_warn(void *arg, int tok, int col, enum mdoc_warn type) +msg_warn(void *arg, int line, int col, enum mdoc_warn type) { - char *fmt, *lit; + char *lit; struct md_parse *p; - int i; extern char *__progname; p = (struct md_parse *)arg; @@ -489,7 +477,7 @@ msg_warn(void *arg, int tok, int col, enum mdoc_warn t if ( ! (p->warn & MD_WARN_ALL)) return(1); - fmt = lit = NULL; + lit = NULL; switch (type) { case (WARN_SYNTAX_WS_EOLN): @@ -505,49 +493,46 @@ msg_warn(void *arg, int tok, int col, enum mdoc_warn t lit = "syntax: argument-like value"; break; case (WARN_SYNTAX_EMPTYBODY): - lit = "syntax: empty block-body section"; + lit = "syntax: macro suggests non-empty block-body section"; break; + case (WARN_SYNTAX_EMPTYHEAD): + lit = "syntax: macro suggests non-empty block-head section"; + break; + case (WARN_SYNTAX_NOBODY): + lit = "syntax: macro suggests empty block-body section"; + break; case (WARN_SEC_OO): lit = "section is out of conventional order"; break; + case (WARN_SEC_REP): + lit = "section repeated"; + break; case (WARN_ARGS_GE1): - fmt = "macro `%s' suggests one or more arguments"; + lit = "macro suggests one or more arguments"; break; case (WARN_ARGS_EQ0): - fmt = "macro `%s' suggests zero arguments"; + lit = "macro suggests zero arguments"; break; case (WARN_IGN_AFTER_BLK): - fmt = "ignore: macro `%s' ignored after block macro"; + lit = "ignore: macro ignored after block macro"; break; case (WARN_IGN_OBSOLETE): - fmt = "ignore: macro `%s' is obsolete"; + lit = "ignore: macro is obsolete"; break; case (WARN_IGN_BEFORE_BLK): - fmt = "ignore: macro before block macro `%s' ignored"; + lit = "ignore: macro before block macro ignored"; break; case (WARN_COMPAT_TROFF): - fmt = "compat: macro `%s' behaves differently in troff and nroff"; + lit = "compat: macro behaves differently in troff and nroff"; break; default: abort(); /* NOTREACHED */ } - if (fmt) { - (void)fprintf(stderr, "%s:%d: warning: ", - p->name, p->lnn); - (void)fprintf(stderr, fmt, mdoc_macronames[tok]); - } else - (void)fprintf(stderr, "%s:%d: warning: %s", - p->name, p->lnn, lit); - if (p->dbg >= 1) { - (void)fprintf(stderr, "\nFrom: %s\n ", p->line); - for (i = 0; i < col; i++) - (void)fprintf(stderr, " "); - (void)fprintf(stderr, "^\n"); - } else - (void)fprintf(stderr, " (column %d)\n", col); + (void)fprintf(stderr, "%s:%d: warning: %s (column %d)\n", + p->name, line, lit, col); if (p->warn & MD_WARN_ERR) { (void)fprintf(stderr, "%s: considering warnings as "