=================================================================== RCS file: /cvs/mandoc/Attic/argv.c,v retrieving revision 1.24 retrieving revision 1.30 diff -u -p -r1.24 -r1.30 --- mandoc/Attic/argv.c 2009/01/21 17:56:32 1.24 +++ mandoc/Attic/argv.c 2009/02/24 11:43:13 1.30 @@ -1,4 +1,4 @@ -/* $Id: argv.c,v 1.24 2009/01/21 17:56:32 kristaps Exp $ */ +/* $Id: argv.c,v 1.30 2009/02/24 11:43:13 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -26,30 +26,40 @@ #include "private.h" /* - * Parse arguments and parameters of macros. Arguments follow the - * syntax of `-arg [val [valN...]]', while parameters are free-form text - * following arguments (if any). This file must correctly handle the - * strange punctuation rules dictated by groff. + * Routines to parse arguments of macros. Arguments follow the syntax + * of `-arg [val [valN...]]'. Arguments come in all types: quoted + * arguments, multiple arguments per value, no-value arguments, etc. */ #define ARGS_QUOTED (1 << 0) #define ARGS_DELIM (1 << 1) #define ARGS_TABSEP (1 << 2) -static int lookup(int, const char *); -static int parse(struct mdoc *, int, +static int argv_a2arg(int, const char *); +static int args(struct mdoc *, int, int *, + char *, int, char **); +static int argv(struct mdoc *, int, struct mdoc_arg *, int *, char *); -static int parse_single(struct mdoc *, int, +static int argv_single(struct mdoc *, int, struct mdoc_arg *, int *, char *); -static int parse_multi(struct mdoc *, int, +static int argv_multi(struct mdoc *, int, struct mdoc_arg *, int *, char *); -static int postparse(struct mdoc *, int, - const struct mdoc_arg *, int); static int pwarn(struct mdoc *, int, int, int); +static int perr(struct mdoc *, int, int, int); +/* Warning messages. */ + #define WQUOTPARM (0) #define WARGVPARM (1) +#define WCOLEMPTY (2) +#define WTAILWS (3) +/* Error messages. */ + +#define EQUOTTERM (0) +#define EARGVAL (1) +#define EARGMANY (2) + static int mdoc_argflags[MDOC_MAX] = { 0, /* \" */ 0, /* Dd */ @@ -161,6 +171,32 @@ static int mdoc_argflags[MDOC_MAX] = { static int +perr(struct mdoc *mdoc, int line, int pos, int code) +{ + int c; + + switch (code) { + case (EQUOTTERM): + c = mdoc_perr(mdoc, line, pos, + "unterminated quoted parameter"); + break; + case (EARGVAL): + c = mdoc_perr(mdoc, line, pos, + "argument requires a value"); + break; + case (EARGMANY): + c = mdoc_perr(mdoc, line, pos, + "too many values for argument"); + break; + default: + abort(); + /* NOTREACHED */ + } + return(c); +} + + +static int pwarn(struct mdoc *mdoc, int line, int pos, int code) { int c; @@ -174,6 +210,14 @@ pwarn(struct mdoc *mdoc, int line, int pos, int code) c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "argument-like parameter"); break; + case (WCOLEMPTY): + c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, + "last list column is empty"); + break; + case (WTAILWS): + c = mdoc_pwarn(mdoc, line, pos, WARN_COMPAT, + "trailing whitespace"); + break; default: abort(); /* NOTREACHED */ @@ -186,25 +230,11 @@ int mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int tok, char **v) { - int i, c, fl; - char *p, *pp; + int fl, c, i; struct mdoc_node *n; - assert(*pos > 0); - - if (0 == buf[*pos]) - return(ARGS_EOLN); - fl = (0 == tok) ? 0 : mdoc_argflags[tok]; - if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) - if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) - return(ARGS_ERROR); - - if ('-' == buf[*pos]) - if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) - return(ARGS_ERROR); - /* * First see if we should use TABSEP (Bl -column). This * invalidates the use of ARGS_DELIM. @@ -218,14 +248,41 @@ mdoc_args(struct mdoc *mdoc, int line, assert(n); c = (int)n->data.block.argc; assert(c > 0); + + /* LINTED */ for (i = 0; i < c; i++) { if (MDOC_Column != n->data.block.argv[i].arg) continue; fl |= ARGS_TABSEP; fl &= ~ARGS_DELIM; + break; } } + return(args(mdoc, line, pos, buf, fl, v)); +} + + +static int +args(struct mdoc *mdoc, int line, + int *pos, char *buf, int fl, char **v) +{ + int i, c; + char *p, *pp; + + assert(*pos > 0); + + if (0 == buf[*pos]) + return(ARGS_EOLN); + + if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) + if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) + return(ARGS_ERROR); + + if ('-' == buf[*pos]) + if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) + return(ARGS_ERROR); + /* * If the first character is a delimiter and we're to look for * delimited strings, then pass down the buffer seeing if it @@ -318,24 +375,29 @@ mdoc_args(struct mdoc *mdoc, int line, p++; if (0 != *p) *(p - 1) = 0; - else if (0 == *p) - if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "empty final token")) /* FIXME: verbiage */ - return(0); *pos += p - *v; } - /* Configure the eoln case, too. */ + if (p && 0 == *p) + if ( ! pwarn(mdoc, line, *pos, WCOLEMPTY)) + return(0); + if (p && 0 == *p && p > *v && ' ' == *(p - 1)) + if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + return(0); - if (NULL == p) { - p = strchr(*v, 0); - assert(p); + if (p) + return(ARGS_WORD); - /*if (p > *v && ' ' == *(p - 1)) - Warn about whitespace. */ + /* Configure the eoln case, too. */ - *pos += p - *v; - } + p = strchr(*v, 0); + assert(p); + if (p > *v && ' ' == *(p - 1)) + if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + return(0); + *pos += p - *v; + return(ARGS_WORD); } @@ -364,7 +426,7 @@ mdoc_args(struct mdoc *mdoc, int line, if (buf[*pos]) return(ARGS_WORD); - if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line")) + if ( ! pwarn(mdoc, line, *pos, WTAILWS)) return(ARGS_ERROR); return(ARGS_WORD); @@ -382,7 +444,7 @@ mdoc_args(struct mdoc *mdoc, int line, (*pos)++; if (0 == buf[*pos]) { - (void)mdoc_perr(mdoc, line, *pos, "unterminated quoted parameter"); + (void)perr(mdoc, line, *pos, EQUOTTERM); return(ARGS_ERROR); } @@ -396,7 +458,7 @@ mdoc_args(struct mdoc *mdoc, int line, if (buf[*pos]) return(ARGS_QWORD); - if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line")) + if ( ! pwarn(mdoc, line, *pos, WTAILWS)) return(ARGS_ERROR); return(ARGS_QWORD); @@ -404,7 +466,7 @@ mdoc_args(struct mdoc *mdoc, int line, static int -lookup(int tok, const char *argv) +argv_a2arg(int tok, const char *argv) { switch (tok) { @@ -568,34 +630,7 @@ lookup(int tok, const char *argv) static int -postparse(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos) -{ - - switch (v->arg) { - case (MDOC_Offset): - assert(v->value); - assert(v->value[0]); - if (xstrcmp(v->value[0], "left")) - break; - if (xstrcmp(v->value[0], "right")) - break; - if (xstrcmp(v->value[0], "center")) - break; - if (xstrcmp(v->value[0], "indent")) - break; - if (xstrcmp(v->value[0], "indent-two")) - break; - return(mdoc_perr(mdoc, line, pos, "invalid offset value")); - default: - break; - } - - return(1); -} - - -static int -parse_multi(struct mdoc *mdoc, int line, +argv_multi(struct mdoc *mdoc, int line, struct mdoc_arg *v, int *pos, char *buf) { int c, ppos; @@ -609,7 +644,7 @@ parse_multi(struct mdoc *mdoc, int line, for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) { if ('-' == buf[*pos]) break; - c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p); + c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); if (ARGS_ERROR == c) { free(v->value); return(0); @@ -622,14 +657,15 @@ parse_multi(struct mdoc *mdoc, int line, return(1); free(v->value); - return(mdoc_perr(mdoc, line, ppos, 0 == v->sz ? - "argument requires a value" : - "too many values to argument")); + if (0 == v->sz) + return(perr(mdoc, line, ppos, EARGVAL)); + + return(perr(mdoc, line, ppos, EARGMANY)); } static int -parse_single(struct mdoc *mdoc, int line, +argv_single(struct mdoc *mdoc, int line, struct mdoc_arg *v, int *pos, char *buf) { int c, ppos; @@ -637,11 +673,11 @@ parse_single(struct mdoc *mdoc, int line, ppos = *pos; - c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p); + c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); if (ARGS_ERROR == c) return(0); if (ARGS_EOLN == c) - return(mdoc_perr(mdoc, line, ppos, "argument requires a value")); + return(perr(mdoc, line, ppos, EARGVAL)); v->sz = 1; v->value = xcalloc(1, sizeof(char *)); @@ -651,7 +687,7 @@ parse_single(struct mdoc *mdoc, int line, static int -parse(struct mdoc *mdoc, int line, +argv(struct mdoc *mdoc, int line, struct mdoc_arg *v, int *pos, char *buf) { @@ -664,9 +700,9 @@ parse(struct mdoc *mdoc, int line, case(MDOC_Width): /* FALLTHROUGH */ case(MDOC_Offset): - return(parse_single(mdoc, line, v, pos, buf)); + return(argv_single(mdoc, line, v, pos, buf)); case(MDOC_Column): - return(parse_multi(mdoc, line, v, pos, buf)); + return(argv_multi(mdoc, line, v, pos, buf)); default: break; } @@ -679,8 +715,8 @@ int mdoc_argv(struct mdoc *mdoc, int line, int tok, struct mdoc_arg *v, int *pos, char *buf) { - int i, ppos; - char *argv; + int i; + char *p; (void)memset(v, 0, sizeof(struct mdoc_arg)); @@ -693,12 +729,14 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, return(ARGV_WORD); i = *pos; - argv = &buf[++(*pos)]; + p = &buf[++(*pos)]; v->line = line; v->pos = *pos; assert(*pos > 0); + + /* LINTED */ while (buf[*pos]) { if (isspace((int)buf[*pos])) if ('\\' != buf[*pos - 1]) @@ -709,8 +747,8 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, if (buf[*pos]) buf[(*pos)++] = 0; - if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) { - if ( ! mdoc_pwarn(mdoc, line, i, WARN_SYNTAX, "argument-like parameter")) + if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) { + if ( ! pwarn(mdoc, line, i, WARGVPARM)) return(ARGV_ERROR); return(ARGV_WORD); } @@ -720,10 +758,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, /* FIXME: whitespace if no value. */ - ppos = *pos; - if ( ! parse(mdoc, line, v, pos, buf)) - return(ARGV_ERROR); - if ( ! postparse(mdoc, line, v, ppos)) + if ( ! argv(mdoc, line, v, pos, buf)) return(ARGV_ERROR); return(ARGV_ARG);