version 1.21, 2009/07/20 14:12:27 |
version 1.74, 2011/04/07 01:08:42 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* 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 |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
|
#endif |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "mdoc.h" |
|
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
|
#include "libmandoc.h" |
|
|
/* |
#define MULTI_STEP 5 /* pre-allocate argument values */ |
* 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. |
|
* |
|
* There's no limit to the number or arguments that may be allocated. |
|
*/ |
|
|
|
/* FIXME .Bf Li raises "macro-like parameter". */ |
static enum mdocargt argv_a2arg(enum mdoct, const char *); |
|
static enum margserr args(struct mdoc *, int, int *, |
#define ARGS_DELIM (1 << 1) |
|
#define ARGS_TABSEP (1 << 2) |
|
|
|
#define ARGV_NONE (1 << 0) |
|
#define ARGV_SINGLE (1 << 1) |
|
#define ARGV_MULTI (1 << 2) |
|
#define ARGV_OPT_SINGLE (1 << 3) |
|
|
|
#define MULTI_STEP 5 |
|
|
|
static int argv_a2arg(int, const char *); |
|
static int args(struct mdoc *, int, int *, |
|
char *, int, char **); |
char *, int, char **); |
|
static int args_checkpunct(struct mdoc *, |
|
const char *, int, int, int); |
static int argv(struct mdoc *, int, |
static int argv(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_single(struct mdoc *, int, |
static int argv_single(struct mdoc *, int, |
Line 55 static int argv_opt_single(struct mdoc *, int, |
|
Line 46 static int argv_opt_single(struct mdoc *, int, |
|
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_multi(struct mdoc *, int, |
static int argv_multi(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
|
static void argn_free(struct mdoc_arg *, int); |
|
|
/* Per-argument flags. */ |
enum argvflag { |
|
ARGV_NONE, /* no args to flag (e.g., -split) */ |
|
ARGV_SINGLE, /* one arg to flag (e.g., -file xxx) */ |
|
ARGV_MULTI, /* multiple args (e.g., -column xxx yyy) */ |
|
ARGV_OPT_SINGLE /* optional arg (e.g., -offset [xxx]) */ |
|
}; |
|
|
static int mdoc_argvflags[MDOC_ARG_MAX] = { |
static const enum argvflag argvflags[MDOC_ARG_MAX] = { |
ARGV_NONE, /* MDOC_Split */ |
ARGV_NONE, /* MDOC_Split */ |
ARGV_NONE, /* MDOC_Nosplit */ |
ARGV_NONE, /* MDOC_Nosplit */ |
ARGV_NONE, /* MDOC_Ragged */ |
ARGV_NONE, /* MDOC_Ragged */ |
ARGV_NONE, /* MDOC_Unfilled */ |
ARGV_NONE, /* MDOC_Unfilled */ |
ARGV_NONE, /* MDOC_Literal */ |
ARGV_NONE, /* MDOC_Literal */ |
ARGV_NONE, /* MDOC_File */ |
ARGV_SINGLE, /* MDOC_File */ |
ARGV_SINGLE, /* MDOC_Offset */ |
ARGV_OPT_SINGLE, /* MDOC_Offset */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Dash */ |
ARGV_NONE, /* MDOC_Dash */ |
ARGV_NONE, /* MDOC_Hyphen */ |
ARGV_NONE, /* MDOC_Hyphen */ |
Line 79 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 76 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
ARGV_MULTI, /* MDOC_Column */ |
ARGV_MULTI, /* MDOC_Column */ |
ARGV_SINGLE, /* MDOC_Width */ |
ARGV_SINGLE, /* MDOC_Width */ |
ARGV_NONE, /* MDOC_Compact */ |
ARGV_NONE, /* MDOC_Compact */ |
ARGV_OPT_SINGLE, /* MDOC_Std */ |
ARGV_NONE, /* MDOC_Std */ |
ARGV_NONE, /* MDOC_Filled */ |
ARGV_NONE, /* MDOC_Filled */ |
ARGV_NONE, /* MDOC_Words */ |
ARGV_NONE, /* MDOC_Words */ |
ARGV_NONE, /* MDOC_Emphasis */ |
ARGV_NONE, /* MDOC_Emphasis */ |
Line 87 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 84 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
ARGV_NONE /* MDOC_Symbolic */ |
ARGV_NONE /* MDOC_Symbolic */ |
}; |
}; |
|
|
static int mdoc_argflags[MDOC_MAX] = { |
static const int argflags[MDOC_MAX] = { |
0, /* Ap */ |
0, /* Ap */ |
0, /* Dd */ |
0, /* Dd */ |
0, /* Dt */ |
0, /* Dt */ |
0, /* Os */ |
0, /* Os */ |
0, /* Sh */ |
0, /* Sh */ |
0, /* Ss */ |
0, /* Ss */ |
ARGS_DELIM, /* Pp */ |
0, /* Pp */ |
ARGS_DELIM, /* D1 */ |
ARGS_DELIM, /* D1 */ |
ARGS_DELIM, /* Dl */ |
ARGS_DELIM, /* Dl */ |
0, /* Bd */ |
0, /* Bd */ |
Line 195 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 192 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* Fr */ |
0, /* Fr */ |
0, /* Ud */ |
0, /* Ud */ |
0, /* Lb */ |
0, /* Lb */ |
ARGS_DELIM, /* Lp */ |
0, /* Lp */ |
ARGS_DELIM, /* Lk */ |
ARGS_DELIM, /* Lk */ |
ARGS_DELIM, /* Mt */ |
ARGS_DELIM, /* Mt */ |
ARGS_DELIM, /* Brq */ |
ARGS_DELIM, /* Brq */ |
Line 208 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 205 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* %Q */ |
0, /* %Q */ |
0, /* br */ |
0, /* br */ |
0, /* sp */ |
0, /* sp */ |
|
0, /* %U */ |
|
0, /* Ta */ |
}; |
}; |
|
|
|
static const enum mdocargt args_Ex[] = { |
|
MDOC_Std, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_An[] = { |
|
MDOC_Split, |
|
MDOC_Nosplit, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bd[] = { |
|
MDOC_Ragged, |
|
MDOC_Unfilled, |
|
MDOC_Filled, |
|
MDOC_Literal, |
|
MDOC_File, |
|
MDOC_Offset, |
|
MDOC_Compact, |
|
MDOC_Centred, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bf[] = { |
|
MDOC_Emphasis, |
|
MDOC_Literal, |
|
MDOC_Symbolic, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bk[] = { |
|
MDOC_Words, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bl[] = { |
|
MDOC_Bullet, |
|
MDOC_Dash, |
|
MDOC_Hyphen, |
|
MDOC_Item, |
|
MDOC_Enum, |
|
MDOC_Tag, |
|
MDOC_Diag, |
|
MDOC_Hang, |
|
MDOC_Ohang, |
|
MDOC_Inset, |
|
MDOC_Column, |
|
MDOC_Width, |
|
MDOC_Offset, |
|
MDOC_Compact, |
|
MDOC_Nested, |
|
MDOC_ARG_MAX |
|
}; |
|
|
/* |
/* |
* Parse an argument from line text. This comes in the form of -key |
* Parse an argument from line text. This comes in the form of -key |
* [value0...], which may either have a single mandatory value, at least |
* [value0...], which may either have a single mandatory value, at least |
* one mandatory value, an optional single value, or no value. |
* one mandatory value, an optional single value, or no value. |
*/ |
*/ |
int |
enum margverr |
mdoc_argv(struct mdoc *m, int line, int tok, |
mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
char *p, sv; |
char *p, sv; |
struct mdoc_argv tmp; |
struct mdoc_argv tmp; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGV_EOLN); |
return(ARGV_EOLN); |
|
|
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
Line 245 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 297 mdoc_argv(struct mdoc *m, int line, int tok, |
|
|
|
/* XXX - save zeroed byte, if not an argument. */ |
/* XXX - save zeroed byte, if not an argument. */ |
|
|
sv = 0; |
sv = '\0'; |
if (buf[*pos]) { |
if (buf[*pos]) { |
sv = buf[*pos]; |
sv = buf[*pos]; |
buf[(*pos)++] = 0; |
buf[(*pos)++] = '\0'; |
} |
} |
|
|
(void)memset(&tmp, 0, sizeof(struct mdoc_argv)); |
memset(&tmp, 0, sizeof(struct mdoc_argv)); |
tmp.line = line; |
tmp.line = line; |
tmp.pos = *pos; |
tmp.pos = *pos; |
|
|
Line 270 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 322 mdoc_argv(struct mdoc *m, int line, int tok, |
|
if ( ! argv(m, line, &tmp, pos, buf)) |
if ( ! argv(m, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
if (NULL == (arg = *v)) { |
if (NULL == (arg = *v)) |
*v = calloc(1, sizeof(struct mdoc_arg)); |
arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg)); |
if (NULL == *v) { |
|
(void)mdoc_nerr(m, m->last, EMALLOC); |
|
return(ARGV_ERROR); |
|
} |
|
arg = *v; |
|
} |
|
|
|
arg->argc++; |
arg->argc++; |
arg->argv = realloc(arg->argv, arg->argc * |
arg->argv = mandoc_realloc |
sizeof(struct mdoc_argv)); |
(arg->argv, arg->argc * sizeof(struct mdoc_argv)); |
|
|
if (NULL == arg->argv) { |
memcpy(&arg->argv[(int)arg->argc - 1], |
(void)mdoc_nerr(m, m->last, EMALLOC); |
|
return(ARGV_ERROR); |
|
} |
|
|
|
(void)memcpy(&arg->argv[(int)arg->argc - 1], |
|
&tmp, sizeof(struct mdoc_argv)); |
&tmp, sizeof(struct mdoc_argv)); |
|
|
return(ARGV_ARG); |
return(ARGV_ARG); |
} |
} |
|
|
|
|
void |
void |
mdoc_argv_free(struct mdoc_arg *p) |
mdoc_argv_free(struct mdoc_arg *p) |
{ |
{ |
int i, j; |
int i; |
|
|
if (NULL == p) |
if (NULL == p) |
return; |
return; |
Line 310 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 350 mdoc_argv_free(struct mdoc_arg *p) |
|
} |
} |
assert(p->argc); |
assert(p->argc); |
|
|
/* LINTED */ |
for (i = (int)p->argc - 1; i >= 0; i--) |
for (i = 0; i < (int)p->argc; i++) { |
argn_free(p, 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); |
|
} |
|
|
|
free(p->argv); |
free(p->argv); |
free(p); |
free(p); |
} |
} |
|
|
|
static void |
int |
argn_free(struct mdoc_arg *p, int iarg) |
mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v) |
|
{ |
{ |
|
struct mdoc_argv *arg; |
|
int j; |
|
|
return(args(m, line, pos, buf, 0, v)); |
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); |
|
} |
|
|
|
for (--p->argc; iarg < (int)p->argc; iarg++) |
|
p->argv[iarg] = p->argv[iarg+1]; |
} |
} |
|
|
|
enum margserr |
|
mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
char *buf, int flags, char **v) |
|
{ |
|
|
int |
return(args(m, line, pos, buf, flags, v)); |
mdoc_args(struct mdoc *m, 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; |
struct mdoc_node *n; |
|
|
fl = (0 == tok) ? 0 : mdoc_argflags[tok]; |
fl = argflags[tok]; |
|
|
if (MDOC_It != tok) |
if (MDOC_It != tok) |
return(args(m, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
|
|
/* |
/* |
* The `It' macro is a special case, as it acquires parameters from its |
* We know that we're in an `It', so it's reasonable to expect |
* parent `Bl' context, specifically, we're concerned with -column. |
* 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. |
*/ |
*/ |
|
|
for (n = m->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) |
if (MDOC_Bl == n->tok) |
break; |
break; |
|
|
assert(n); |
if (n && LIST_column == n->norm->Bl.type) { |
c = (int)(n->args ? n->args->argc : 0); |
|
assert(c > 0); |
|
|
|
/* LINTED */ |
|
for (i = 0; i < c; i++) { |
|
if (MDOC_Column != n->args->argv[i].arg) |
|
continue; |
|
fl |= ARGS_TABSEP; |
fl |= ARGS_TABSEP; |
fl &= ~ARGS_DELIM; |
fl &= ~ARGS_DELIM; |
break; |
|
} |
} |
|
|
return(args(m, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
} |
} |
|
|
|
static enum margserr |
static int |
|
args(struct mdoc *m, int line, int *pos, |
args(struct mdoc *m, int line, int *pos, |
char *buf, int fl, char **v) |
char *buf, int fl, char **v) |
{ |
{ |
int i; |
char *p, *pp; |
char *p, *pp; |
enum margserr rc; |
|
|
assert(*pos); |
/* |
assert(' ' != buf[*pos]); |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
|
* `.Xx val'), which can have all sorts of properties: |
if (0 == buf[*pos]) |
* |
return(ARGS_EOLN); |
* ARGS_DELIM: use special handling if encountering trailing |
|
* delimiters in the form of [[::delim::][ ]+]+. |
/* |
* |
* If the first character is a delimiter and we're to look for |
* ARGS_NOWARN: don't post warnings. This is only used when |
* delimited strings, then pass down the buffer seeing if it |
* re-parsing delimiters, as the warnings have already been |
* follows the pattern of [[::delim::][ ]+]+. |
* posted. |
|
* |
|
* ARGS_TABSEP: use special handling for tab/`Ta' separated |
|
* phrases like in `Bl -column'. |
*/ |
*/ |
|
|
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
assert(' ' != buf[*pos]); |
for (i = *pos; buf[i]; ) { |
|
if ( ! mdoc_iscdelim(buf[i])) |
|
break; |
|
i++; |
|
if (0 == buf[i] || ' ' != buf[i]) |
|
break; |
|
i++; |
|
while (buf[i] && ' ' == buf[i]) |
|
i++; |
|
} |
|
|
|
/* FIXME: warn about trailing whitespace. */ |
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) |
|
mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE); |
|
|
if (0 == buf[i]) { |
m->flags &= ~MDOC_PHRASELIT; |
*v = &buf[*pos]; |
return(ARGS_EOLN); |
return(ARGS_PUNCT); |
|
} |
|
} |
} |
|
|
*v = &buf[*pos]; |
*v = &buf[*pos]; |
|
|
|
if (ARGS_DELIM & fl && args_checkpunct(m, buf, *pos, line, fl)) |
|
return(ARGS_PUNCT); |
|
|
/* |
/* |
* First handle TABSEP items, restricted to `Bl -column'. This |
* First handle TABSEP items, restricted to `Bl -column'. This |
* ignores conventional token parsing and instead uses tabs or |
* ignores conventional token parsing and instead uses tabs or |
Line 423 args(struct mdoc *m, int line, int *pos, |
|
Line 468 args(struct mdoc *m, int line, int *pos, |
|
if (ARGS_TABSEP & fl) { |
if (ARGS_TABSEP & fl) { |
/* Scan ahead to tab (can't be escaped). */ |
/* Scan ahead to tab (can't be escaped). */ |
p = strchr(*v, '\t'); |
p = strchr(*v, '\t'); |
|
pp = NULL; |
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Scan ahead to unescaped `Ta'. */ |
for (pp = *v; ; pp++) { |
if ( ! (MDOC_PHRASELIT & m->flags)) |
if (NULL == (pp = strstr(pp, "Ta"))) |
for (pp = *v; ; pp++) { |
break; |
if (NULL == (pp = strstr(pp, "Ta"))) |
if (pp > *v && ' ' != *(pp - 1)) |
break; |
continue; |
if (pp > *v && ' ' != *(pp - 1)) |
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
continue; |
break; |
if (' ' == *(pp + 2) || '\0' == *(pp + 2)) |
} |
break; |
|
} |
|
|
|
/* By default, assume a phrase. */ |
|
rc = ARGS_PHRASE; |
|
|
/* |
/* |
* Adjust new-buffer position to be beyond delimiter |
* Adjust new-buffer position to be beyond delimiter |
* mark (e.g., Ta -> end + 2). |
* mark (e.g., Ta -> end + 2). |
*/ |
*/ |
if (p && pp) { |
if (p && pp) { |
*pos += pp < p ? 2 : 1; |
*pos += pp < p ? 2 : 1; |
|
rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE; |
p = pp < p ? pp : p; |
p = pp < p ? pp : p; |
} else if (p && ! pp) { |
} else if (p && ! pp) { |
|
rc = ARGS_PPHRASE; |
*pos += 1; |
*pos += 1; |
} else if (pp && ! p) { |
} else if (pp && ! p) { |
p = pp; |
p = pp; |
*pos += 2; |
*pos += 2; |
} else |
} else { |
|
rc = ARGS_PEND; |
p = strchr(*v, 0); |
p = strchr(*v, 0); |
|
} |
|
|
/* Whitespace check for eoln case... */ |
/* Whitespace check for eoln case... */ |
if (0 == *p && ' ' == *(p - 1)) |
if ('\0' == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
return(ARGS_ERROR); |
|
|
|
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
Line 469 args(struct mdoc *m, int line, int *pos, |
|
Line 522 args(struct mdoc *m, int line, int *pos, |
|
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
return(ARGS_PHRASE); |
return(rc); |
} |
} |
|
|
/* |
/* |
Line 478 args(struct mdoc *m, int line, int *pos, |
|
Line 531 args(struct mdoc *m, int line, int *pos, |
|
* Whitespace is NOT involved in literal termination. |
* Whitespace is NOT involved in literal termination. |
*/ |
*/ |
|
|
if ('\"' == buf[*pos]) { |
if (MDOC_PHRASELIT & m->flags || '\"' == buf[*pos]) { |
*v = &buf[++(*pos)]; |
if ( ! (MDOC_PHRASELIT & m->flags)) |
|
*v = &buf[++(*pos)]; |
|
|
|
if (MDOC_PPHRASE & m->flags) |
|
m->flags |= MDOC_PHRASELIT; |
|
|
for ( ; buf[*pos]; (*pos)++) { |
for ( ; buf[*pos]; (*pos)++) { |
if ('\"' != buf[*pos]) |
if ('\"' != buf[*pos]) |
continue; |
continue; |
Line 489 args(struct mdoc *m, int line, int *pos, |
|
Line 546 args(struct mdoc *m, int line, int *pos, |
|
(*pos)++; |
(*pos)++; |
} |
} |
|
|
if (0 == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
if (ARGS_NOWARN & fl || MDOC_PPHRASE & m->flags) |
return(ARGS_ERROR); |
return(ARGS_QWORD); |
|
mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
buf[(*pos)++] = 0; |
m->flags &= ~MDOC_PHRASELIT; |
|
buf[(*pos)++] = '\0'; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
return(ARGS_ERROR); |
|
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
Line 516 args(struct mdoc *m, int line, int *pos, |
|
Line 574 args(struct mdoc *m, int line, int *pos, |
|
*/ |
*/ |
|
|
for ( ; buf[*pos]; (*pos)++) |
for ( ; buf[*pos]; (*pos)++) |
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
if (*pos && ' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
break; |
break; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
buf[(*pos)++] = 0; |
buf[(*pos)++] = '\0'; |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
return(ARGS_ERROR); |
|
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
|
|
|
/* |
|
* 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 |
static int |
argv_a2arg(int tok, const char *argv) |
args_checkpunct(struct mdoc *m, const char *buf, int i, int ln, int fl) |
{ |
{ |
|
int j; |
|
char dbuf[DELIMSZ]; |
|
enum mdelim d; |
|
|
/* |
/* First token must be a close-delimiter. */ |
* 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! |
|
*/ |
|
|
|
|
for (j = 0; buf[i] && ' ' != buf[i] && j < DELIMSZ; j++, i++) |
|
dbuf[j] = buf[i]; |
|
|
|
if (DELIMSZ == j) |
|
return(0); |
|
|
|
dbuf[j] = '\0'; |
|
if (DELIM_CLOSE != mdoc_isdelim(dbuf)) |
|
return(0); |
|
|
|
while (' ' == buf[i]) |
|
i++; |
|
|
|
/* Remaining must NOT be open/none. */ |
|
|
|
while (buf[i]) { |
|
j = 0; |
|
while (buf[i] && ' ' != buf[i] && j < DELIMSZ) |
|
dbuf[j++] = buf[i++]; |
|
|
|
if (DELIMSZ == j) |
|
return(0); |
|
|
|
dbuf[j] = '\0'; |
|
d = mdoc_isdelim(dbuf); |
|
if (DELIM_NONE == d || DELIM_OPEN == d) |
|
return(0); |
|
|
|
while (' ' == buf[i]) |
|
i++; |
|
} |
|
|
|
if ( ! (ARGS_NOWARN & fl) && i && ' ' == buf[i - 1]) |
|
mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE); |
|
|
|
return('\0' == buf[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) |
|
{ |
|
const enum mdocargt *argsp; |
|
|
|
argsp = NULL; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_An): |
case (MDOC_An): |
if (0 == strcmp(argv, "split")) |
argsp = args_An; |
return(MDOC_Split); |
|
else if (0 == strcmp(argv, "nosplit")) |
|
return(MDOC_Nosplit); |
|
break; |
break; |
|
|
case (MDOC_Bd): |
case (MDOC_Bd): |
if (0 == strcmp(argv, "ragged")) |
argsp = args_Bd; |
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); |
|
break; |
break; |
|
|
case (MDOC_Bf): |
case (MDOC_Bf): |
if (0 == strcmp(argv, "emphasis")) |
argsp = args_Bf; |
return(MDOC_Emphasis); |
|
else if (0 == strcmp(argv, "literal")) |
|
return(MDOC_Literal); |
|
else if (0 == strcmp(argv, "symbolic")) |
|
return(MDOC_Symbolic); |
|
break; |
break; |
|
|
case (MDOC_Bk): |
case (MDOC_Bk): |
if (0 == strcmp(argv, "words")) |
argsp = args_Bk; |
return(MDOC_Words); |
|
break; |
break; |
|
|
case (MDOC_Bl): |
case (MDOC_Bl): |
if (0 == strcmp(argv, "bullet")) |
argsp = args_Bl; |
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); |
|
break; |
break; |
|
|
case (MDOC_Rv): |
case (MDOC_Rv): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ex): |
case (MDOC_Ex): |
if (0 == strcmp(argv, "std")) |
argsp = args_Ex; |
return(MDOC_Std); |
|
break; |
break; |
default: |
default: |
break; |
return(MDOC_ARG_MAX); |
} |
} |
|
|
|
assert(argsp); |
|
|
|
for ( ; MDOC_ARG_MAX != *argsp ; argsp++) |
|
if (0 == strcmp(p, mdoc_argnames[*argsp])) |
|
return(*argsp); |
|
|
return(MDOC_ARG_MAX); |
return(MDOC_ARG_MAX); |
} |
} |
|
|
|
|
static int |
static int |
argv_multi(struct mdoc *m, int line, |
argv_multi(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c; |
enum margserr ac; |
char *p; |
char *p; |
|
|
for (v->sz = 0; ; v->sz++) { |
for (v->sz = 0; ; v->sz++) { |
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
break; |
break; |
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (0 == v->sz % MULTI_STEP) { |
if (0 == v->sz % MULTI_STEP) |
v->value = realloc(v->value, |
v->value = mandoc_realloc(v->value, |
(v->sz + MULTI_STEP) * sizeof(char *)); |
(v->sz + MULTI_STEP) * sizeof(char *)); |
if (NULL == v->value) { |
|
(void)mdoc_nerr(m, m->last, EMALLOC); |
v->value[(int)v->sz] = mandoc_strdup(p); |
return(ARGV_ERROR); |
|
} |
|
} |
|
if (NULL == (v->value[(int)v->sz] = strdup(p))) |
|
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
} |
} |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
argv_opt_single(struct mdoc *m, int line, |
argv_opt_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
return(1); |
return(1); |
|
|
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
return(1); |
return(1); |
|
|
v->sz = 1; |
v->sz = 1; |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
v->value = mandoc_malloc(sizeof(char *)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
v->value[0] = mandoc_strdup(p); |
if (NULL == (v->value[0] = strdup(p))) |
|
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Parse a single, mandatory value from the stream. |
* Parse a single, mandatory value from the stream. |
*/ |
*/ |
|
|
argv_single(struct mdoc *m, int line, |
argv_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c, ppos; |
int ppos; |
|
enum margserr ac; |
char *p; |
char *p; |
|
|
ppos = *pos; |
ppos = *pos; |
|
|
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_EOLN == ac) { |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTARGVCOUNT); |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
} else if (ARGS_ERROR == ac) |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
return(0); |
|
|
v->sz = 1; |
v->sz = 1; |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
v->value = mandoc_malloc(sizeof(char *)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
v->value[0] = mandoc_strdup(p); |
if (NULL == (v->value[0] = strdup(p))) |
|
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Determine rules for parsing arguments. Arguments can either accept |
* Determine rules for parsing arguments. Arguments can either accept |
* no parameters, an optional single parameter, one parameter, or |
* no parameters, an optional single parameter, one parameter, or |
Line 732 argv(struct mdoc *mdoc, int line, |
|
Line 779 argv(struct mdoc *mdoc, int line, |
|
v->sz = 0; |
v->sz = 0; |
v->value = NULL; |
v->value = NULL; |
|
|
switch (mdoc_argvflags[v->arg]) { |
switch (argvflags[v->arg]) { |
case (ARGV_SINGLE): |
case (ARGV_SINGLE): |
return(argv_single(mdoc, line, v, pos, buf)); |
return(argv_single(mdoc, line, v, pos, buf)); |
case (ARGV_MULTI): |
case (ARGV_MULTI): |
return(argv_multi(mdoc, line, v, pos, buf)); |
return(argv_multi(mdoc, line, v, pos, buf)); |
case (ARGV_OPT_SINGLE): |
case (ARGV_OPT_SINGLE): |
return(argv_opt_single(mdoc, line, v, pos, buf)); |
return(argv_opt_single(mdoc, line, v, pos, buf)); |
default: |
case (ARGV_NONE): |
/* ARGV_NONE */ |
|
break; |
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
return(1); |
return(1); |