-/* $Id: mdoc_argv.c,v 1.6 2009/06/17 11:02:06 kristaps Exp $ */
+/* $Id: mdoc_argv.c,v 1.65 2011/03/17 01:23:28 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
+#include "mandoc.h"
#include "libmdoc.h"
+#include "libmandoc.h"
/*
* Routines to parse arguments of macros. Arguments follow the syntax
* There's no limit to the number or arguments that may be allocated.
*/
-/* FIXME .Bf Li raises "macro-like parameter". */
-
-#define ARGS_QUOTED (1 << 0)
-#define ARGS_DELIM (1 << 1)
-#define ARGS_TABSEP (1 << 2)
-#define ARGS_ARGVLIKE (1 << 3)
-
#define ARGV_NONE (1 << 0)
#define ARGV_SINGLE (1 << 1)
#define ARGV_MULTI (1 << 2)
#define MULTI_STEP 5
-enum mwarn {
- WQUOTPARM,
- WARGVPARM,
- WCOLEMPTY,
- WTAILWS
-};
-
-enum merr {
- EQUOTTERM,
- EMALLOC,
- EARGVAL
-};
-
-static int argv_a2arg(int, const char *);
-static int args(struct mdoc *, int, int *,
+static enum mdocargt argv_a2arg(enum mdoct, const char *);
+static enum margserr args(struct mdoc *, int, int *,
char *, int, char **);
+static int args_checkpunct(const char *);
static int argv(struct mdoc *, int,
struct mdoc_argv *, int *, char *);
static int argv_single(struct mdoc *, int,
struct mdoc_argv *, int *, char *);
static int argv_multi(struct mdoc *, int,
struct mdoc_argv *, int *, char *);
-static int pwarn(struct mdoc *, int, int, enum mwarn);
-static int perr(struct mdoc *, int, int, enum merr);
-
-#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t))
/* Per-argument flags. */
ARGV_NONE, /* MDOC_Ragged */
ARGV_NONE, /* MDOC_Unfilled */
ARGV_NONE, /* MDOC_Literal */
- ARGV_NONE, /* MDOC_File */
- ARGV_SINGLE, /* MDOC_Offset */
+ ARGV_SINGLE, /* MDOC_File */
+ ARGV_OPT_SINGLE, /* MDOC_Offset */
ARGV_NONE, /* MDOC_Bullet */
ARGV_NONE, /* MDOC_Dash */
ARGV_NONE, /* MDOC_Hyphen */
ARGV_MULTI, /* MDOC_Column */
ARGV_SINGLE, /* MDOC_Width */
ARGV_NONE, /* MDOC_Compact */
- ARGV_OPT_SINGLE, /* MDOC_Std */
+ ARGV_NONE, /* MDOC_Std */
ARGV_NONE, /* MDOC_Filled */
ARGV_NONE, /* MDOC_Words */
ARGV_NONE, /* MDOC_Emphasis */
0, /* Dd */
0, /* Dt */
0, /* Os */
- ARGS_QUOTED, /* Sh */
- ARGS_QUOTED, /* Ss */
- ARGS_DELIM, /* Pp */
+ 0, /* Sh */
+ 0, /* Ss */
+ 0, /* Pp */
ARGS_DELIM, /* D1 */
- ARGS_DELIM | ARGS_QUOTED, /* Dl */
+ ARGS_DELIM, /* Dl */
0, /* Bd */
0, /* Ed */
0, /* Bl */
0, /* It */
ARGS_DELIM, /* Ad */
ARGS_DELIM, /* An */
- ARGS_DELIM | ARGS_QUOTED, /* Ar */
- ARGS_QUOTED, /* Cd */
+ ARGS_DELIM, /* Ar */
+ 0, /* Cd */
ARGS_DELIM, /* Cm */
ARGS_DELIM, /* Dv */
ARGS_DELIM, /* Er */
ARGS_DELIM, /* Ev */
0, /* Ex */
- ARGS_DELIM | ARGS_QUOTED, /* Fa */
+ ARGS_DELIM, /* Fa */
0, /* Fd */
ARGS_DELIM, /* Fl */
- ARGS_DELIM | ARGS_QUOTED, /* Fn */
- ARGS_DELIM | ARGS_QUOTED, /* Ft */
+ ARGS_DELIM, /* Fn */
+ ARGS_DELIM, /* Ft */
ARGS_DELIM, /* Ic */
0, /* In */
- ARGS_DELIM | ARGS_QUOTED, /* Li */
- ARGS_QUOTED, /* Nd */
+ ARGS_DELIM, /* Li */
+ 0, /* Nd */
ARGS_DELIM, /* Nm */
ARGS_DELIM, /* Op */
0, /* Ot */
ARGS_DELIM, /* Pa */
0, /* Rv */
- ARGS_DELIM | ARGS_ARGVLIKE, /* St */
+ ARGS_DELIM, /* St */
ARGS_DELIM, /* Va */
ARGS_DELIM, /* Vt */
ARGS_DELIM, /* Xr */
- ARGS_QUOTED, /* %A */
- ARGS_QUOTED, /* %B */
- ARGS_QUOTED, /* %D */
- ARGS_QUOTED, /* %I */
- ARGS_QUOTED, /* %J */
- ARGS_QUOTED, /* %N */
- ARGS_QUOTED, /* %O */
- ARGS_QUOTED, /* %P */
- ARGS_QUOTED, /* %R */
- ARGS_QUOTED, /* %T */
- ARGS_QUOTED, /* %V */
+ 0, /* %A */
+ 0, /* %B */
+ 0, /* %D */
+ 0, /* %I */
+ 0, /* %J */
+ 0, /* %N */
+ 0, /* %O */
+ 0, /* %P */
+ 0, /* %R */
+ 0, /* %T */
+ 0, /* %V */
ARGS_DELIM, /* Ac */
0, /* Ao */
ARGS_DELIM, /* Aq */
ARGS_DELIM, /* Sq */
0, /* Sm */
ARGS_DELIM, /* Sx */
- ARGS_DELIM | ARGS_QUOTED, /* Sy */
+ ARGS_DELIM, /* Sy */
ARGS_DELIM, /* Tn */
ARGS_DELIM, /* Ux */
ARGS_DELIM, /* Xc */
0, /* Xo */
- ARGS_QUOTED, /* Fo */
+ 0, /* Fo */
0, /* Fc */
0, /* Oo */
ARGS_DELIM, /* Oc */
0, /* Fr */
0, /* Ud */
0, /* Lb */
- ARGS_DELIM, /* Lp */
- ARGS_DELIM | ARGS_QUOTED, /* Lk */
- ARGS_DELIM | ARGS_QUOTED, /* Mt */
+ 0, /* Lp */
+ ARGS_DELIM, /* Lk */
+ ARGS_DELIM, /* Mt */
ARGS_DELIM, /* Brq */
0, /* Bro */
ARGS_DELIM, /* Brc */
- ARGS_QUOTED, /* %C */
+ 0, /* %C */
0, /* Es */
0, /* En */
0, /* Dx */
- ARGS_QUOTED, /* %Q */
+ 0, /* %Q */
+ 0, /* br */
+ 0, /* sp */
+ 0, /* %U */
+ 0, /* Ta */
};
* [value0...], which may either have a single mandatory value, at least
* one mandatory value, an optional single value, or no value.
*/
-int
-mdoc_argv(struct mdoc *mdoc, int line, int tok,
+enum margverr
+mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
struct mdoc_arg **v, int *pos, char *buf)
{
- int i;
char *p, sv;
struct mdoc_argv tmp;
struct mdoc_arg *arg;
- if (0 == buf[*pos])
+ if ('\0' == buf[*pos])
return(ARGV_EOLN);
assert(' ' != buf[*pos]);
- if ('-' != buf[*pos] || ARGS_ARGVLIKE & mdoc_argflags[tok])
- return(ARGV_WORD);
-
/* Parse through to the first unescaped space. */
- i = *pos;
p = &buf[++(*pos)];
assert(*pos > 0);
/* XXX - save zeroed byte, if not an argument. */
- sv = 0;
+ sv = '\0';
if (buf[*pos]) {
sv = buf[*pos];
- buf[(*pos)++] = 0;
+ buf[(*pos)++] = '\0';
}
(void)memset(&tmp, 0, sizeof(struct mdoc_argv));
/* XXX - restore saved zeroed byte. */
if (sv)
buf[*pos - 1] = sv;
- if ( ! pwarn(mdoc, line, i, WARGVPARM))
- return(ARGV_ERROR);
return(ARGV_WORD);
}
while (buf[*pos] && ' ' == buf[*pos])
(*pos)++;
- if ( ! argv(mdoc, line, &tmp, pos, buf))
+ if ( ! argv(m, line, &tmp, pos, buf))
return(ARGV_ERROR);
- if (NULL == (arg = *v)) {
- *v = calloc(1, sizeof(struct mdoc_arg));
- if (NULL == *v) {
- (void)verr(mdoc, EMALLOC);
- return(ARGV_ERROR);
- }
- arg = *v;
- }
+ if (NULL == (arg = *v))
+ arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg));
arg->argc++;
- arg->argv = realloc(arg->argv, arg->argc *
- sizeof(struct mdoc_argv));
-
- if (NULL == arg->argv) {
- (void)verr(mdoc, EMALLOC);
- return(ARGV_ERROR);
- }
+ arg->argv = mandoc_realloc
+ (arg->argv, arg->argc * sizeof(struct mdoc_argv));
(void)memcpy(&arg->argv[(int)arg->argc - 1],
&tmp, sizeof(struct mdoc_argv));
void
mdoc_argv_free(struct mdoc_arg *p)
{
- int i, j;
+ int i;
if (NULL == p)
return;
}
assert(p->argc);
- /* LINTED */
- for (i = 0; i < (int)p->argc; i++) {
- if (0 == p->argv[i].sz)
- continue;
- /* LINTED */
- for (j = 0; j < (int)p->argv[i].sz; j++)
- free(p->argv[i].value[j]);
-
- free(p->argv[i].value);
- }
+ for (i = (int)p->argc - 1; i >= 0; i--)
+ mdoc_argn_free(p, i);
free(p->argv);
free(p);
}
-
-static int
-perr(struct mdoc *mdoc, int line, int pos, enum merr code)
+void
+mdoc_argn_free(struct mdoc_arg *p, int iarg)
{
- char *p;
+ struct mdoc_argv *arg;
+ int j;
- p = NULL;
- switch (code) {
- case (EMALLOC):
- p = "memory exhausted";
- break;
- case (EQUOTTERM):
- p = "unterminated quoted parameter";
- break;
- case (EARGVAL):
- p = "argument requires a value";
- break;
+ arg = &p->argv[iarg];
+
+ if (arg->sz && arg->value) {
+ for (j = (int)arg->sz - 1; j >= 0; j--)
+ free(arg->value[j]);
+ free(arg->value);
}
- assert(p);
- return(mdoc_perr(mdoc, line, pos, p));
+
+ for (--p->argc; iarg < (int)p->argc; iarg++)
+ p->argv[iarg] = p->argv[iarg+1];
}
-static int
-pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn code)
+enum margserr
+mdoc_zargs(struct mdoc *m, int line, int *pos,
+ char *buf, int flags, char **v)
{
- char *p;
- int c;
- p = NULL;
- c = WARN_SYNTAX;
- switch (code) {
- case (WQUOTPARM):
- p = "unexpected quoted parameter";
- break;
- case (WARGVPARM):
- p = "argument-like parameter";
- break;
- case (WCOLEMPTY):
- p = "last list column is empty";
- c = WARN_COMPAT;
- break;
- case (WTAILWS):
- p = "trailing whitespace";
- c = WARN_COMPAT;
- break;
- }
- assert(p);
- return(mdoc_pwarn(mdoc, line, pos, c, p));
+ return(args(m, line, pos, buf, flags, v));
}
-int
-mdoc_args(struct mdoc *mdoc, int line,
- int *pos, char *buf, int tok, char **v)
+enum margserr
+mdoc_args(struct mdoc *m, int line, int *pos,
+ char *buf, enum mdoct tok, char **v)
{
- int fl, c, i;
+ int fl;
struct mdoc_node *n;
- fl = (0 == tok) ? 0 : mdoc_argflags[tok];
-
- /*
- * Override per-macro argument flags with context-specific ones.
- * As of now, this is only valid for `It' depending on its list
- * context.
- */
+ fl = mdoc_argflags[tok];
- switch (tok) {
- case (MDOC_It):
- for (n = mdoc->last; n; n = n->parent)
- if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok)
- break;
+ if (MDOC_It != tok)
+ return(args(m, line, pos, buf, fl, v));
- assert(n);
- c = (int)(n->args ? n->args->argc : 0);
- assert(c > 0);
+ /*
+ * We know that we're in an `It', so it's reasonable to expect
+ * us to be sitting in a `Bl'. Someday this may not be the case
+ * (if we allow random `It's sitting out there), so provide a
+ * safe fall-back into the default behaviour.
+ */
- /*
- * Using `Bl -column' adds ARGS_TABSEP to the arguments
- * and invalidates ARGS_DELIM. Using `Bl -diag' allows
- * for quoted arguments.
- */
+ for (n = m->last; n; n = n->parent)
+ if (MDOC_Bl == n->tok)
+ break;
- /* LINTED */
- for (i = 0; i < c; i++) {
- switch (n->args->argv[i].arg) {
- case (MDOC_Column):
- fl |= ARGS_TABSEP;
- fl &= ~ARGS_DELIM;
- i = c;
- break;
- case (MDOC_Diag):
- fl |= ARGS_QUOTED;
- i = c;
- break;
- default:
- break;
- }
- }
- break;
- default:
- break;
+ if (n && LIST_column == n->norm->Bl.type) {
+ fl |= ARGS_TABSEP;
+ fl &= ~ARGS_DELIM;
}
- return(args(mdoc, line, pos, buf, fl, v));
+ return(args(m, line, pos, buf, fl, v));
}
-static int
-args(struct mdoc *mdoc, int line,
- int *pos, char *buf, int fl, char **v)
+static enum margserr
+args(struct mdoc *m, int line, int *pos,
+ char *buf, int fl, char **v)
{
- int i;
- char *p, *pp;
+ int i;
+ char *p, *pp;
+ enum margserr rc;
- assert(*pos > 0);
+ /*
+ * Parse out the terms (like `val' in `.Xx -arg val' or simply
+ * `.Xx val'), which can have all sorts of properties:
+ *
+ * ARGS_DELIM: use special handling if encountering trailing
+ * delimiters in the form of [[::delim::][ ]+]+.
+ *
+ * ARGS_NOWARN: don't post warnings. This is only used when
+ * re-parsing delimiters, as the warnings have already been
+ * posted.
+ *
+ * ARGS_TABSEP: use special handling for tab/`Ta' separated
+ * phrases like in `Bl -column'.
+ */
- if (0 == buf[*pos])
- return(ARGS_EOLN);
+ assert(' ' != buf[*pos]);
- if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED))
- if ( ! pwarn(mdoc, line, *pos, WQUOTPARM))
- return(ARGS_ERROR);
+ if ('\0' == buf[*pos]) {
+ if (MDOC_PPHRASE & m->flags)
+ return(ARGS_EOLN);
+ /*
+ * If we're not in a partial phrase and the flag for
+ * being a phrase literal is still set, the punctuation
+ * is unterminated.
+ */
+ if (MDOC_PHRASELIT & m->flags)
+ if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE))
+ return(ARGS_ERROR);
- if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos])
- if ( ! pwarn(mdoc, line, *pos, WARGVPARM))
- return(ARGS_ERROR);
+ m->flags &= ~MDOC_PHRASELIT;
+ return(ARGS_EOLN);
+ }
- /*
- * If the first character is a delimiter and we're to look for
- * delimited strings, then pass down the buffer seeing if it
- * follows the pattern of [[::delim::][ ]+]+.
- */
+ *v = &buf[*pos];
- if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
- for (i = *pos; buf[i]; ) {
- if ( ! mdoc_iscdelim(buf[i]))
- break;
- i++;
- /* There must be at least one space... */
- if (0 == buf[i] || ' ' != buf[i])
- break;
- i++;
- while (buf[i] && ' ' == buf[i])
- i++;
- }
- if (0 == buf[i]) {
- *v = &buf[*pos];
+ if (ARGS_DELIM & fl && args_checkpunct(&buf[*pos])) {
+ i = strlen(&buf[*pos]) + *pos;
+ if (i && ' ' != buf[i - 1])
return(ARGS_PUNCT);
- }
+ if (ARGS_NOWARN & fl)
+ return(ARGS_PUNCT);
+ /* FIXME: remove conditional messages... */
+ if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
+ return(ARGS_ERROR);
+ return(ARGS_PUNCT);
}
- /* First parse non-quoted strings. */
-
- if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) {
- *v = &buf[*pos];
-
- /*
- * Thar be dragons here! If we're tab-separated, search
- * ahead for either a tab or the `Ta' macro.
- * If a `Ta' is detected, it must be space-buffered before and
- * after. If either of these hold true, then prune out the
- * extra spaces and call it an argument.
- */
-
- if (ARGS_TABSEP & fl) {
- /* Scan ahead to unescaped tab. */
-
- p = strchr(*v, '\t');
+ /*
+ * First handle TABSEP items, restricted to `Bl -column'. This
+ * ignores conventional token parsing and instead uses tabs or
+ * `Ta' macros to separate phrases. Phrases are parsed again
+ * for arguments at a later phase.
+ */
- /* Scan ahead to unescaped `Ta'. */
+ if (ARGS_TABSEP & fl) {
+ /* Scan ahead to tab (can't be escaped). */
+ p = strchr(*v, '\t');
+ pp = NULL;
+ /* Scan ahead to unescaped `Ta'. */
+ if ( ! (MDOC_PHRASELIT & m->flags))
for (pp = *v; ; pp++) {
if (NULL == (pp = strstr(pp, "Ta")))
break;
if (pp > *v && ' ' != *(pp - 1))
continue;
- if (' ' == *(pp + 2) || 0 == *(pp + 2))
+ if (' ' == *(pp + 2) || '\0' == *(pp + 2))
break;
}
- /* Choose delimiter tab/Ta. */
-
- if (p && pp)
- p = (p < pp ? p : pp);
- else if ( ! p && pp)
- p = pp;
+ /* By default, assume a phrase. */
+ rc = ARGS_PHRASE;
- /* Strip delimiter's preceding whitespace. */
+ /*
+ * Adjust new-buffer position to be beyond delimiter
+ * mark (e.g., Ta -> end + 2).
+ */
+ if (p && pp) {
+ *pos += pp < p ? 2 : 1;
+ rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE;
+ p = pp < p ? pp : p;
+ } else if (p && ! pp) {
+ rc = ARGS_PPHRASE;
+ *pos += 1;
+ } else if (pp && ! p) {
+ p = pp;
+ *pos += 2;
+ } else {
+ rc = ARGS_PEND;
+ p = strchr(*v, 0);
+ }
- if (p && p > *v) {
- pp = p - 1;
- while (pp > *v && ' ' == *pp)
- pp--;
- if (pp == *v && ' ' == *pp)
- *pp = 0;
- else if (' ' == *pp)
- *(pp + 1) = 0;
- }
+ /* Whitespace check for eoln case... */
+ if ('\0' == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))
+ if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
+ return(ARGS_ERROR);
- /* ...in- and proceding whitespace. */
+ *pos += (int)(p - *v);
- if (p && ('\t' != *p)) {
- *p++ = 0;
- *p++ = 0;
- } else if (p)
- *p++ = 0;
+ /* Strip delimiter's preceding whitespace. */
+ pp = p - 1;
+ while (pp > *v && ' ' == *pp) {
+ if (pp > *v && '\\' == *(pp - 1))
+ break;
+ pp--;
+ }
+ *(pp + 1) = 0;
- if (p) {
- while (' ' == *p)
- p++;
- if (0 != *p)
- *(p - 1) = 0;
- *pos += (int)(p - *v);
- }
+ /* Strip delimiter's proceeding whitespace. */
+ for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++)
+ /* Skip ahead. */ ;
- 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);
+ return(rc);
+ }
- if (p)
- return(ARGS_PHRASE);
+ /*
+ * Process a quoted literal. A quote begins with a double-quote
+ * and ends with a double-quote NOT preceded by a double-quote.
+ * Whitespace is NOT involved in literal termination.
+ */
- /* Configure the eoln case, too. */
+ if (MDOC_PHRASELIT & m->flags || '\"' == buf[*pos]) {
+ if ( ! (MDOC_PHRASELIT & m->flags))
+ *v = &buf[++(*pos)];
- p = strchr(*v, 0);
- assert(p);
-
- if (p > *v && ' ' == *(p - 1))
- if ( ! pwarn(mdoc, line, *pos, WTAILWS))
- return(0);
- *pos += (int)(p - *v);
-
- return(ARGS_PHRASE);
- }
-
- /* Do non-tabsep look-ahead here. */
-
- if ( ! (ARGS_TABSEP & fl))
- while (buf[*pos]) {
- if (' ' == buf[*pos])
- if ('\\' != buf[*pos - 1])
- break;
- (*pos)++;
- }
+ if (MDOC_PPHRASE & m->flags)
+ m->flags |= MDOC_PHRASELIT;
- if (0 == buf[*pos])
- return(ARGS_WORD);
+ for ( ; buf[*pos]; (*pos)++) {
+ if ('\"' != buf[*pos])
+ continue;
+ if ('\"' != buf[*pos + 1])
+ break;
+ (*pos)++;
+ }
- buf[(*pos)++] = 0;
+ if ('\0' == buf[*pos]) {
+ if (ARGS_NOWARN & fl || MDOC_PPHRASE & m->flags)
+ return(ARGS_QWORD);
+ if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE))
+ return(ARGS_ERROR);
+ return(ARGS_QWORD);
+ }
- if (0 == buf[*pos])
- return(ARGS_WORD);
+ m->flags &= ~MDOC_PHRASELIT;
+ buf[(*pos)++] = '\0';
- if ( ! (ARGS_TABSEP & fl))
- while (buf[*pos] && ' ' == buf[*pos])
- (*pos)++;
+ if ('\0' == buf[*pos])
+ return(ARGS_QWORD);
- if (buf[*pos])
- return(ARGS_WORD);
+ while (' ' == buf[*pos])
+ (*pos)++;
- if ( ! pwarn(mdoc, line, *pos, WTAILWS))
- return(ARGS_ERROR);
+ if (0 == buf[*pos] && ! (ARGS_NOWARN & fl))
+ if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
+ return(ARGS_ERROR);
- return(ARGS_WORD);
+ return(ARGS_QWORD);
}
- /*
- * If we're a quoted string (and quoted strings are allowed),
- * then parse ahead to the next quote. If none's found, it's an
- * error. After, parse to the next word.
+ /*
+ * A non-quoted term progresses until either the end of line or
+ * a non-escaped whitespace.
*/
- *v = &buf[++(*pos)];
+ for ( ; buf[*pos]; (*pos)++)
+ if (*pos && ' ' == buf[*pos] && '\\' != buf[*pos - 1])
+ break;
+
+ if ('\0' == buf[*pos])
+ return(ARGS_WORD);
+
+ buf[(*pos)++] = '\0';
- while (buf[*pos] && '\"' != buf[*pos])
+ while (' ' == buf[*pos])
(*pos)++;
- if (0 == buf[*pos]) {
- (void)perr(mdoc, line, *pos, EQUOTTERM);
- return(ARGS_ERROR);
- }
+ if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl))
+ if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
+ return(ARGS_ERROR);
- buf[(*pos)++] = 0;
- if (0 == buf[*pos])
- return(ARGS_QWORD);
+ return(ARGS_WORD);
+}
- while (buf[*pos] && ' ' == buf[*pos])
- (*pos)++;
+/*
+ * Check if the string consists only of space-separated closing
+ * delimiters. This is a bit of a dance: the first must be a close
+ * delimiter, but it may be followed by middle delimiters. Arbitrary
+ * whitespace may separate these tokens.
+ */
+static int
+args_checkpunct(const char *p)
+{
+ int i, j;
+ char buf[DELIMSZ];
+ enum mdelim d;
- if (buf[*pos])
- return(ARGS_QWORD);
+ i = 0;
- if ( ! pwarn(mdoc, line, *pos, WTAILWS))
- return(ARGS_ERROR);
+ /* First token must be a close-delimiter. */
- return(ARGS_QWORD);
-}
+ for (j = 0; p[i] && ' ' != p[i] && j < DELIMSZ; j++, i++)
+ buf[j] = p[i];
+ if (DELIMSZ == j)
+ return(0);
-static int
-argv_a2arg(int tok, const char *argv)
+ buf[j] = '\0';
+ if (DELIM_CLOSE != mdoc_isdelim(buf))
+ return(0);
+
+ while (' ' == p[i])
+ i++;
+
+ /* Remaining must NOT be open/none. */
+
+ while (p[i]) {
+ j = 0;
+ while (p[i] && ' ' != p[i] && j < DELIMSZ)
+ buf[j++] = p[i++];
+
+ if (DELIMSZ == j)
+ return(0);
+
+ buf[j] = '\0';
+ d = mdoc_isdelim(buf);
+ if (DELIM_NONE == d || DELIM_OPEN == d)
+ return(0);
+
+ while (' ' == p[i])
+ i++;
+ }
+
+ return('\0' == p[i]);
+}
+
+/*
+ * Match up an argument string (e.g., `-foo bar' having "foo") with the
+ * correrct identifier. It must apply to the given macro. If none was
+ * found (including bad matches), return MDOC_ARG_MAX.
+ */
+static enum mdocargt
+argv_a2arg(enum mdoct tok, const char *p)
{
+ enum mdocargt args[MDOC_ARG_MAX];
+ int i, len;
- /*
- * Parse an argument identifier from its text. XXX - this
- * should really be table-driven to clarify the code.
- *
- * If you add an argument to the list, make sure that you
- * register it here with its one or more macros!
- */
+ len = 0;
switch (tok) {
case (MDOC_An):
- if (0 == strcmp(argv, "split"))
- return(MDOC_Split);
- else if (0 == strcmp(argv, "nosplit"))
- return(MDOC_Nosplit);
+ args[len++] = MDOC_Split;
+ args[len++] = MDOC_Nosplit;
break;
-
case (MDOC_Bd):
- if (0 == strcmp(argv, "ragged"))
- return(MDOC_Ragged);
- else if (0 == strcmp(argv, "unfilled"))
- return(MDOC_Unfilled);
- else if (0 == strcmp(argv, "filled"))
- return(MDOC_Filled);
- else if (0 == strcmp(argv, "literal"))
- return(MDOC_Literal);
- else if (0 == strcmp(argv, "file"))
- return(MDOC_File);
- else if (0 == strcmp(argv, "offset"))
- return(MDOC_Offset);
- else if (0 == strcmp(argv, "compact"))
- return(MDOC_Compact);
+ args[len++] = MDOC_Ragged;
+ args[len++] = MDOC_Unfilled;
+ args[len++] = MDOC_Filled;
+ args[len++] = MDOC_Literal;
+ args[len++] = MDOC_File;
+ args[len++] = MDOC_Offset;
+ args[len++] = MDOC_Compact;
+ args[len++] = MDOC_Centred;
break;
-
case (MDOC_Bf):
- if (0 == strcmp(argv, "emphasis"))
- return(MDOC_Emphasis);
- else if (0 == strcmp(argv, "literal"))
- return(MDOC_Literal);
- else if (0 == strcmp(argv, "symbolic"))
- return(MDOC_Symbolic);
+ args[len++] = MDOC_Emphasis;
+ args[len++] = MDOC_Literal;
+ args[len++] = MDOC_Symbolic;
break;
-
case (MDOC_Bk):
- if (0 == strcmp(argv, "words"))
- return(MDOC_Words);
+ args[len++] = MDOC_Words;
break;
-
case (MDOC_Bl):
- if (0 == strcmp(argv, "bullet"))
- return(MDOC_Bullet);
- else if (0 == strcmp(argv, "dash"))
- return(MDOC_Dash);
- else if (0 == strcmp(argv, "hyphen"))
- return(MDOC_Hyphen);
- else if (0 == strcmp(argv, "item"))
- return(MDOC_Item);
- else if (0 == strcmp(argv, "enum"))
- return(MDOC_Enum);
- else if (0 == strcmp(argv, "tag"))
- return(MDOC_Tag);
- else if (0 == strcmp(argv, "diag"))
- return(MDOC_Diag);
- else if (0 == strcmp(argv, "hang"))
- return(MDOC_Hang);
- else if (0 == strcmp(argv, "ohang"))
- return(MDOC_Ohang);
- else if (0 == strcmp(argv, "inset"))
- return(MDOC_Inset);
- else if (0 == strcmp(argv, "column"))
- return(MDOC_Column);
- else if (0 == strcmp(argv, "width"))
- return(MDOC_Width);
- else if (0 == strcmp(argv, "offset"))
- return(MDOC_Offset);
- else if (0 == strcmp(argv, "compact"))
- return(MDOC_Compact);
- else if (0 == strcmp(argv, "nested"))
- return(MDOC_Nested);
+ args[len++] = MDOC_Bullet;
+ args[len++] = MDOC_Dash;
+ args[len++] = MDOC_Hyphen;
+ args[len++] = MDOC_Item;
+ args[len++] = MDOC_Enum;
+ args[len++] = MDOC_Tag;
+ args[len++] = MDOC_Diag;
+ args[len++] = MDOC_Hang;
+ args[len++] = MDOC_Ohang;
+ args[len++] = MDOC_Inset;
+ args[len++] = MDOC_Column;
+ args[len++] = MDOC_Width;
+ args[len++] = MDOC_Offset;
+ args[len++] = MDOC_Compact;
+ args[len++] = MDOC_Nested;
break;
-
case (MDOC_Rv):
/* FALLTHROUGH */
case (MDOC_Ex):
- if (0 == strcmp(argv, "std"))
- return(MDOC_Std);
+ args[len++] = MDOC_Std;
break;
default:
break;
}
+ for (i = 0; i < len; i++)
+ if (0 == strcmp(p, mdoc_argnames[args[i]]))
+ return(args[i]);
+
return(MDOC_ARG_MAX);
}
static int
-argv_multi(struct mdoc *mdoc, int line,
+argv_multi(struct mdoc *m, int line,
struct mdoc_argv *v, int *pos, char *buf)
{
- int c, ppos;
+ enum margserr ac;
char *p;
- ppos = *pos;
-
for (v->sz = 0; ; v->sz++) {
if ('-' == buf[*pos])
break;
- c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
- if (ARGS_ERROR == c)
+ ac = args(m, line, pos, buf, 0, &p);
+ if (ARGS_ERROR == ac)
return(0);
- else if (ARGS_EOLN == c)
+ else if (ARGS_EOLN == ac)
break;
- if (0 == v->sz % MULTI_STEP) {
- v->value = realloc(v->value,
+ if (0 == v->sz % MULTI_STEP)
+ v->value = mandoc_realloc(v->value,
(v->sz + MULTI_STEP) * sizeof(char *));
- if (NULL == v->value) {
- (void)verr(mdoc, EMALLOC);
- return(ARGV_ERROR);
- }
- }
- if (NULL == (v->value[(int)v->sz] = strdup(p)))
- return(verr(mdoc, EMALLOC));
- }
- if (v->sz)
- return(1);
+ v->value[(int)v->sz] = mandoc_strdup(p);
+ }
- return(perr(mdoc, line, ppos, EARGVAL));
+ return(1);
}
static int
-argv_opt_single(struct mdoc *mdoc, int line,
+argv_opt_single(struct mdoc *m, int line,
struct mdoc_argv *v, int *pos, char *buf)
{
- int c;
+ enum margserr ac;
char *p;
if ('-' == buf[*pos])
return(1);
- c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
- if (ARGS_ERROR == c)
+ ac = args(m, line, pos, buf, 0, &p);
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == c)
+ if (ARGS_EOLN == ac)
return(1);
v->sz = 1;
- if (NULL == (v->value = calloc(1, sizeof(char *))))
- return(verr(mdoc, EMALLOC));
- if (NULL == (v->value[0] = strdup(p)))
- return(verr(mdoc, EMALLOC));
+ v->value = mandoc_malloc(sizeof(char *));
+ v->value[0] = mandoc_strdup(p);
return(1);
}
* Parse a single, mandatory value from the stream.
*/
static int
-argv_single(struct mdoc *mdoc, int line,
+argv_single(struct mdoc *m, int line,
struct mdoc_argv *v, int *pos, char *buf)
{
- int c, ppos;
+ int ppos;
+ enum margserr ac;
char *p;
ppos = *pos;
- c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
- if (ARGS_ERROR == c)
+ ac = args(m, line, pos, buf, 0, &p);
+ if (ARGS_EOLN == ac) {
+ mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTARGVCOUNT);
+ return(0);
+ } else if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == c)
- return(perr(mdoc, line, ppos, EARGVAL));
v->sz = 1;
- if (NULL == (v->value = calloc(1, sizeof(char *))))
- return(verr(mdoc, EMALLOC));
- if (NULL == (v->value[0] = strdup(p)))
- return(verr(mdoc, EMALLOC));
+ v->value = mandoc_malloc(sizeof(char *));
+ v->value[0] = mandoc_strdup(p);
return(1);
}
git.ckatri.com / mandoc.git / blobdiff