-/* $Id: argv.c,v 1.8 2009/01/05 17:57:07 kristaps Exp $ */
+/* $Id: argv.c,v 1.17 2009/01/19 17:02:58 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
#include "private.h"
+/* FIXME: .It called with -column and quoted arguments. */
+
static int lookup(int, const char *);
-static int parse(struct mdoc *, int,
+static int parse(struct mdoc *, int,
+ struct mdoc_arg *, int *, char *);
+static int parse_single(struct mdoc *, int,
+ struct mdoc_arg *, int *, char *);
+static int parse_multi(struct mdoc *, int,
struct mdoc_arg *, int *, char *);
static int postparse(struct mdoc *, int,
const struct mdoc_arg *, int);
int
-mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v)
+mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
{
int i;
return(ARGS_EOLN);
if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED))
- if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_QUOTED))
+ if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "unexpected quoted parameter"))
return(ARGS_ERROR);
if ('-' == buf[*pos])
- if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_ARGLIKE))
+ if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "argument-like parameter"))
return(ARGS_ERROR);
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
+ /*
+ * If ARGS_DELIM, return ARGS_PUNCT if only space-separated
+ * punctuation remains.
+ */
for (i = *pos; buf[i]; ) {
if ( ! mdoc_iscdelim(buf[i]))
break;
}
}
- /*
- * Parse routine for non-quoted string.
- */
+ /* Parse routine for non-quoted string. */
- if ('\"' != buf[*pos]) {
+ assert(*pos > 0);
+ if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) {
*v = &buf[*pos];
- while (buf[*pos] && ! isspace(buf[*pos]))
- (*pos)++;
+ /* FIXME: UGLY tab-sep processing. */
+
+ if (ARGS_TABSEP & fl)
+ while (buf[*pos]) {
+ if ('\t' == buf[*pos])
+ break;
+ if ('T' == buf[*pos]) {
+ (*pos)++;
+ if (0 == buf[*pos])
+ break;
+ if ('a' == buf[*pos]) {
+ buf[*pos - 1] = 0;
+ break;
+ }
+ }
+ (*pos)++;
+ }
+ else {
+ while (buf[*pos]) {
+ if (isspace(buf[*pos]))
+ if ('\\' != buf[*pos - 1])
+ break;
+ (*pos)++;
+ }
+ }
if (0 == buf[*pos])
return(ARGS_WORD);
buf[(*pos)++] = 0;
+
if (0 == buf[*pos])
return(ARGS_WORD);
- while (buf[*pos] && isspace(buf[*pos]))
- (*pos)++;
+ if ( ! (ARGS_TABSEP & fl))
+ while (buf[*pos] && isspace(buf[*pos]))
+ (*pos)++;
if (buf[*pos])
return(ARGS_WORD);
- if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN))
+ if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))
return(ARGS_ERROR);
return(ARGS_WORD);
(*pos)++;
if (0 == buf[*pos]) {
- (void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_UNQUOTE);
+ (void)mdoc_perr(mdoc, line, *pos, "unterminated quoted parameter");
return(ARGS_ERROR);
}
if (buf[*pos])
return(ARGS_WORD);
- if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN))
+ if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))
return(ARGS_ERROR);
return(ARGS_WORD);
return(MDOC_Ragged);
else if (xstrcmp(argv, "unfilled"))
return(MDOC_Unfilled);
+ else if (xstrcmp(argv, "filled"))
+ return(MDOC_Filled);
else if (xstrcmp(argv, "literal"))
return(MDOC_Literal);
else if (xstrcmp(argv, "file"))
static int
-postparse(struct mdoc *mdoc, int tok, const struct mdoc_arg *v, int pos)
+postparse(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos)
{
switch (v->arg) {
break;
if (xstrcmp(v->value[0], "indent-two"))
break;
- return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_ARGBAD));
+ return(mdoc_perr(mdoc, line, pos, "invalid offset value"));
default:
break;
}
static int
-parse(struct mdoc *mdoc, int tok,
+parse_multi(struct mdoc *mdoc, int line,
+ struct mdoc_arg *v, int *pos, char *buf)
+{
+ int c, ppos;
+ char *p;
+
+ v->sz = 0;
+ v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *));
+
+ ppos = *pos;
+
+ 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);
+ if (ARGS_ERROR == c) {
+ free(v->value);
+ return(0);
+ } else if (ARGS_EOLN == c)
+ break;
+ v->value[v->sz] = p;
+ }
+
+ if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)
+ return(1);
+
+ free(v->value);
+ return(mdoc_perr(mdoc, line, ppos, 0 == v->sz ?
+ "argument requires a value" :
+ "too many values to argument"));
+}
+
+
+static int
+parse_single(struct mdoc *mdoc, int line,
struct mdoc_arg *v, int *pos, char *buf)
{
+ int c, ppos;
char *p;
- int c, ppos, i;
ppos = *pos;
+ c = mdoc_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"));
+
+ v->sz = 1;
+ v->value = xcalloc(1, sizeof(char *));
+ v->value[0] = p;
+ return(1);
+}
+
+
+static int
+parse(struct mdoc *mdoc, int line,
+ struct mdoc_arg *v, int *pos, char *buf)
+{
+
+ v->sz = 0;
+ v->value = NULL;
+
switch (v->arg) {
case(MDOC_Std):
/* FALLTHROUGH */
case(MDOC_Width):
/* FALLTHROUGH */
case(MDOC_Offset):
- /*
- * This has a single value for an argument.
- */
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_QUOTED, &p);
- if (ARGS_ERROR == c)
- return(0);
- else if (ARGS_EOLN == c)
- return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGVAL));
-
- v->sz = 1;
- v->value = xcalloc(1, sizeof(char *));
- v->value[0] = p;
- break;
-
+ return(parse_single(mdoc, line, v, pos, buf));
case(MDOC_Column):
- /*
- * This has several value for a single argument. We
- * pre-allocate a pointer array and don't let it exceed
- * this size.
- */
- v->sz = 0;
- v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *));
- for (i = 0; i < MDOC_LINEARG_MAX; i++) {
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_QUOTED, &p);
- if (ARGS_ERROR == c) {
- free(v->value);
- return(0);
- } else if (ARGS_EOLN == c)
- break;
- v->value[i] = p;
- }
- if (0 == i) {
- free(v->value);
- return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGVAL));
- } else if (MDOC_LINEARG_MAX == i)
- return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGMANY));
-
- v->sz = i;
- break;
-
+ return(parse_multi(mdoc, line, v, pos, buf));
default:
- v->sz = 0;
- v->value = NULL;
break;
}
int
-mdoc_argv(struct mdoc *mdoc, int tok,
+mdoc_argv(struct mdoc *mdoc, int line, int tok,
struct mdoc_arg *v, int *pos, char *buf)
{
int i, ppos;
i = *pos;
argv = &buf[++(*pos)];
- while (buf[*pos] && ! isspace(buf[*pos]))
+ v->line = line;
+ v->pos = *pos;
+
+ assert(*pos > 0);
+ while (buf[*pos]) {
+ if (isspace(buf[*pos]))
+ if ('\\' != buf[*pos - 1])
+ break;
(*pos)++;
+ }
if (buf[*pos])
buf[(*pos)++] = 0;
if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) {
- (void)mdoc_err(mdoc, tok, i, ERR_SYNTAX_ARG);
- return(ARGV_ERROR);
+ if ( ! mdoc_pwarn(mdoc, line, i, WARN_SYNTAX, "argument-like parameter"))
+ return(ARGV_ERROR);
+ return(ARGV_WORD);
}
while (buf[*pos] && isspace(buf[*pos]))
/* FIXME: whitespace if no value. */
ppos = *pos;
- if ( ! parse(mdoc, tok, v, pos, buf))
+ if ( ! parse(mdoc, line, v, pos, buf))
return(ARGV_ERROR);
- if ( ! postparse(mdoc, tok, v, ppos))
+ if ( ! postparse(mdoc, line, v, ppos))
return(ARGV_ERROR);
return(ARGV_ARG);
git.ckatri.com / mandoc.git / blobdiff