version 1.41, 2009/03/08 12:46:38 |
version 1.56, 2009/03/23 14:22:11 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> |
* |
* |
* 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 |
* purpose with or without fee is hereby granted, provided that the |
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
* PERFORMANCE OF THIS SOFTWARE. |
* PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <err.h> |
#include <err.h> |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
|
|
#include "private.h" |
#include "libmdoc.h" |
|
|
/* |
/* |
* Routines to parse arguments of macros. Arguments follow the syntax |
* Routines to parse arguments of macros. Arguments follow the syntax |
|
|
#define ARGV_MULTI (1 << 2) |
#define ARGV_MULTI (1 << 2) |
#define ARGV_OPT_SINGLE (1 << 3) |
#define ARGV_OPT_SINGLE (1 << 3) |
|
|
|
#define MULTI_STEP 5 |
|
|
enum mwarn { |
enum mwarn { |
WQUOTPARM, |
WQUOTPARM, |
WARGVPARM, |
WARGVPARM, |
|
|
static int argv_a2arg(int, const char *); |
static int argv_a2arg(int, const char *); |
static int args(struct mdoc *, int, int *, |
static int args(struct mdoc *, int, int *, |
char *, int, char **); |
char *, int, char **); |
static int argv(struct mdoc *, int, 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, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
Line 92 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 96 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_SINGLE, /* MDOC_Std */ |
ARGV_OPT_SINGLE, /* 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 */ |
|
ARGV_NONE, /* MDOC_Symbolic */ |
ARGV_NONE /* MDOC_Symbolic */ |
ARGV_NONE /* MDOC_Symbolic */ |
}; |
}; |
|
|
Line 207 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 212 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* Fr */ |
0, /* Fr */ |
0, /* Ud */ |
0, /* Ud */ |
0, /* Lb */ |
0, /* Lb */ |
|
0, /* Ap */ |
|
ARGS_DELIM, /* Lp */ |
|
ARGS_DELIM | ARGS_QUOTED, /* Lk */ |
|
ARGS_DELIM | ARGS_QUOTED, /* Mt */ |
|
ARGS_DELIM, /* Brq */ |
|
0, /* Bro */ |
|
ARGS_DELIM, /* Brc */ |
|
ARGS_QUOTED, /* %C */ |
|
0, /* Es */ |
|
0, /* En */ |
|
0, /* Dx */ |
|
ARGS_QUOTED, /* %Q */ |
}; |
}; |
|
|
|
|
Line 220 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 237 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
int i; |
int i; |
char *p; |
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( ! isspace((u_char)buf[*pos])); |
assert(' ' != buf[*pos]); |
|
|
if ('-' != buf[*pos]) |
if ('-' != buf[*pos] || ARGS_ARGVLIKE & mdoc_argflags[tok]) |
return(ARGV_WORD); |
return(ARGV_WORD); |
|
|
|
/* Parse through to the first unescaped space. */ |
|
|
i = *pos; |
i = *pos; |
p = &buf[++(*pos)]; |
p = &buf[++(*pos)]; |
|
|
Line 239 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 258 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
|
|
/* LINTED */ |
/* LINTED */ |
while (buf[*pos]) { |
while (buf[*pos]) { |
if (isspace((u_char)buf[*pos])) |
if (' ' == buf[*pos]) |
if ('\\' != buf[*pos - 1]) |
if ('\\' != buf[*pos - 1]) |
break; |
break; |
(*pos)++; |
(*pos)++; |
} |
} |
|
|
if (buf[*pos]) |
/* XXX - save zeroed byte, if not an argument. */ |
|
|
|
sv = 0; |
|
if (buf[*pos]) { |
|
sv = buf[*pos]; |
buf[(*pos)++] = 0; |
buf[(*pos)++] = 0; |
|
} |
|
|
(void)memset(&tmp, 0, sizeof(struct mdoc_argv)); |
(void)memset(&tmp, 0, sizeof(struct mdoc_argv)); |
tmp.line = line; |
tmp.line = line; |
tmp.pos = *pos; |
tmp.pos = *pos; |
|
|
/* |
/* See if our token accepts the argument. */ |
* We now parse out the per-macro arguments. XXX - this can be |
|
* made much cleaner using per-argument tables. See argv_a2arg |
|
* for details. |
|
*/ |
|
|
|
if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { |
if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { |
|
/* XXX - restore saved zeroed byte. */ |
|
if (sv) |
|
buf[*pos - 1] = sv; |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |
} |
} |
|
|
while (buf[*pos] && isspace((u_char)buf[*pos])) |
while (buf[*pos] && ' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
/* FIXME: whitespace if no value. */ |
if ( ! argv(mdoc, line, &tmp, pos, buf)) |
|
|
if ( ! argv(mdoc, tok, line, &tmp, pos, buf)) |
|
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
if (NULL == (arg = *v)) { |
if (NULL == (arg = *v)) { |
*v = xcalloc(1, sizeof(struct mdoc_arg)); |
if (NULL == (*v = calloc(1, sizeof(struct mdoc_arg)))) |
|
err(1, "calloc"); |
arg = *v; |
arg = *v; |
} |
} |
|
|
Line 309 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 331 mdoc_argv_free(struct mdoc_arg *p) |
|
if (0 == p->argv[i].sz) |
if (0 == p->argv[i].sz) |
continue; |
continue; |
/* LINTED */ |
/* LINTED */ |
for (j = 0; j < (int)p->argv[i].sz; j++) |
for (j = 0; j < (int)p->argv[i].sz; j++) |
free(p->argv[i].value[j]); |
free(p->argv[i].value[j]); |
|
|
free(p->argv[i].value); |
free(p->argv[i].value); |
Line 425 mdoc_args(struct mdoc *mdoc, int line, |
|
Line 447 mdoc_args(struct mdoc *mdoc, int line, |
|
break; |
break; |
} |
} |
|
|
/* Continue parsing the arguments themselves... */ |
|
|
|
return(args(mdoc, line, pos, buf, fl, v)); |
return(args(mdoc, line, pos, buf, fl, v)); |
} |
} |
|
|
Line 463 args(struct mdoc *mdoc, int line, |
|
Line 483 args(struct mdoc *mdoc, int line, |
|
break; |
break; |
i++; |
i++; |
/* There must be at least one space... */ |
/* There must be at least one space... */ |
if (0 == buf[i] || ! isspace((u_char)buf[i])) |
if (0 == buf[i] || ' ' != buf[i]) |
break; |
break; |
i++; |
i++; |
while (buf[i] && isspace((u_char)buf[i])) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
} |
} |
if (0 == buf[i]) { |
if (0 == buf[i]) { |
Line 482 args(struct mdoc *mdoc, int line, |
|
Line 502 args(struct mdoc *mdoc, int line, |
|
|
|
/* |
/* |
* Thar be dragons here! If we're tab-separated, search |
* Thar be dragons here! If we're tab-separated, search |
* ahead for either a tab or the `Ta' macro. If a tab |
* ahead for either a tab or the `Ta' macro. |
* is detected, it mustn't be escaped; if a `Ta' is |
* If a `Ta' is detected, it must be space-buffered before and |
* detected, it must be space-buffered before and after. |
* after. If either of these hold true, then prune out the |
* If either of these hold true, then prune out the |
|
* extra spaces and call it an argument. |
* extra spaces and call it an argument. |
*/ |
*/ |
|
|
if (ARGS_TABSEP & fl) { |
if (ARGS_TABSEP & fl) { |
/* Scan ahead to unescaped tab. */ |
/* Scan ahead to unescaped tab. */ |
|
|
for (p = *v; ; p++) { |
p = strchr(*v, '\t'); |
if (NULL == (p = strchr(p, '\t'))) |
|
break; |
|
if (p == *v) |
|
break; |
|
if ('\\' != *(p - 1)) |
|
break; |
|
} |
|
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Scan ahead to unescaped `Ta'. */ |
|
|
Line 555 args(struct mdoc *mdoc, int line, |
|
Line 567 args(struct mdoc *mdoc, int line, |
|
return(0); |
return(0); |
|
|
if (p) |
if (p) |
return(ARGS_WORD); |
return(ARGS_PHRASE); |
|
|
/* Configure the eoln case, too. */ |
/* Configure the eoln case, too. */ |
|
|
Line 567 args(struct mdoc *mdoc, int line, |
|
Line 579 args(struct mdoc *mdoc, int line, |
|
return(0); |
return(0); |
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
return(ARGS_WORD); |
return(ARGS_PHRASE); |
} |
} |
|
|
/* Do non-tabsep look-ahead here. */ |
/* Do non-tabsep look-ahead here. */ |
|
|
if ( ! (ARGS_TABSEP & fl)) |
if ( ! (ARGS_TABSEP & fl)) |
while (buf[*pos]) { |
while (buf[*pos]) { |
if (isspace((u_char)buf[*pos])) |
if (' ' == buf[*pos]) |
if ('\\' != buf[*pos - 1]) |
if ('\\' != buf[*pos - 1]) |
break; |
break; |
(*pos)++; |
(*pos)++; |
Line 589 args(struct mdoc *mdoc, int line, |
|
Line 601 args(struct mdoc *mdoc, int line, |
|
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
if ( ! (ARGS_TABSEP & fl)) |
if ( ! (ARGS_TABSEP & fl)) |
while (buf[*pos] && isspace((u_char)buf[*pos])) |
while (buf[*pos] && ' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (buf[*pos]) |
if (buf[*pos]) |
Line 621 args(struct mdoc *mdoc, int line, |
|
Line 633 args(struct mdoc *mdoc, int line, |
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
|
|
while (buf[*pos] && isspace((u_char)buf[*pos])) |
while (buf[*pos] && ' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (buf[*pos]) |
if (buf[*pos]) |
Line 667 argv_a2arg(int tok, const char *argv) |
|
Line 679 argv_a2arg(int tok, const char *argv) |
|
return(MDOC_File); |
return(MDOC_File); |
else if (xstrcmp(argv, "offset")) |
else if (xstrcmp(argv, "offset")) |
return(MDOC_Offset); |
return(MDOC_Offset); |
|
else if (xstrcmp(argv, "compact")) |
|
return(MDOC_Compact); |
break; |
break; |
|
|
case (MDOC_Bf): |
case (MDOC_Bf): |
Line 712 argv_a2arg(int tok, const char *argv) |
|
Line 726 argv_a2arg(int tok, const char *argv) |
|
return(MDOC_Offset); |
return(MDOC_Offset); |
else if (xstrcmp(argv, "compact")) |
else if (xstrcmp(argv, "compact")) |
return(MDOC_Compact); |
return(MDOC_Compact); |
|
else if (xstrcmp(argv, "nested")) |
|
return(MDOC_Nested); |
break; |
break; |
|
|
case (MDOC_Rv): |
case (MDOC_Rv): |
Line 746 argv_multi(struct mdoc *mdoc, int line, |
|
Line 762 argv_multi(struct mdoc *mdoc, int line, |
|
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (0 == v->sz % 5) |
if (0 == v->sz % MULTI_STEP) |
v->value = xrealloc(v->value, |
v->value = xrealloc(v->value, |
(v->sz + 5) * sizeof(char *)); |
(v->sz + MULTI_STEP) * sizeof(char *)); |
|
|
v->value[(int)v->sz] = xstrdup(p); |
v->value[(int)v->sz] = xstrdup(p); |
} |
} |
Line 777 argv_opt_single(struct mdoc *mdoc, int line, |
|
Line 793 argv_opt_single(struct mdoc *mdoc, int line, |
|
return(1); |
return(1); |
|
|
v->sz = 1; |
v->sz = 1; |
v->value = xcalloc(1, sizeof(char *)); |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
v->value[0] = xstrdup(p); |
err(1, "calloc"); |
|
if (NULL == (v->value[0] = strdup(p))) |
|
err(1, "strdup"); |
return(1); |
return(1); |
} |
} |
|
|
Line 802 argv_single(struct mdoc *mdoc, int line, |
|
Line 820 argv_single(struct mdoc *mdoc, int line, |
|
return(perr(mdoc, line, ppos, EARGVAL)); |
return(perr(mdoc, line, ppos, EARGVAL)); |
|
|
v->sz = 1; |
v->sz = 1; |
v->value = xcalloc(1, sizeof(char *)); |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
v->value[0] = xstrdup(p); |
err(1, "calloc"); |
|
if (NULL == (v->value[0] = strdup(p))) |
|
err(1, "strdup"); |
return(1); |
return(1); |
} |
} |
|
|
Line 814 argv_single(struct mdoc *mdoc, int line, |
|
Line 834 argv_single(struct mdoc *mdoc, int line, |
|
* multiple parameters. |
* multiple parameters. |
*/ |
*/ |
static int |
static int |
argv(struct mdoc *mdoc, int tok, int line, |
argv(struct mdoc *mdoc, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int fl; |
|
|
|
v->sz = 0; |
v->sz = 0; |
v->value = NULL; |
v->value = NULL; |
fl = mdoc_argvflags[v->arg]; |
|
|
|
/* |
switch (mdoc_argvflags[v->arg]) { |
* Override the default per-argument value. |
|
*/ |
|
|
|
switch (tok) { |
|
case (MDOC_Ex): |
|
fl = ARGV_OPT_SINGLE; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
switch (fl) { |
|
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): |