version 1.22, 2009/08/19 14:44:35 |
version 1.34, 2010/03/29 19:28:04 |
|
|
* 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 <string.h> |
#include <string.h> |
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
|
#include "libmandoc.h" |
|
|
/* |
/* |
* Routines to parse arguments of macros. Arguments follow the syntax |
* Routines to parse arguments of macros. Arguments follow the syntax |
|
|
* There's no limit to the number or arguments that may be allocated. |
* There's no limit to the number or arguments that may be allocated. |
*/ |
*/ |
|
|
#define ARGS_DELIM (1 << 1) |
|
#define ARGS_TABSEP (1 << 2) |
|
|
|
#define ARGV_NONE (1 << 0) |
#define ARGV_NONE (1 << 0) |
#define ARGV_SINGLE (1 << 1) |
#define ARGV_SINGLE (1 << 1) |
#define ARGV_MULTI (1 << 2) |
#define ARGV_MULTI (1 << 2) |
Line 62 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 64 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
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 77 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 79 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 206 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 208 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* %Q */ |
0, /* %Q */ |
0, /* br */ |
0, /* br */ |
0, /* sp */ |
0, /* sp */ |
|
0, /* %U */ |
}; |
}; |
|
|
|
|
Line 268 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 271 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) { |
|
(void)mdoc_nerr(m, m->last, EMALLOC); |
|
return(ARGV_ERROR); |
|
} |
|
|
|
(void)memcpy(&arg->argv[(int)arg->argc - 1], |
(void)memcpy(&arg->argv[(int)arg->argc - 1], |
&tmp, sizeof(struct mdoc_argv)); |
&tmp, sizeof(struct mdoc_argv)); |
|
|
Line 312 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 304 mdoc_argv_free(struct mdoc_arg *p) |
|
for (i = 0; i < (int)p->argc; i++) { |
for (i = 0; i < (int)p->argc; i++) { |
if (0 == p->argv[i].sz) |
if (0 == p->argv[i].sz) |
continue; |
continue; |
|
if (NULL == p->argv[i].value) |
|
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]); |
if (p->argv[i].value[j]) |
|
free(p->argv[i].value[j]); |
|
|
free(p->argv[i].value); |
free(p->argv[i].value); |
} |
} |
Line 325 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 321 mdoc_argv_free(struct mdoc_arg *p) |
|
|
|
|
|
int |
int |
mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v) |
mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
char *buf, int flags, char **v) |
{ |
{ |
|
|
return(args(m, line, pos, buf, 0, v)); |
return(args(m, line, pos, buf, flags, v)); |
} |
} |
|
|
|
|
Line 377 args(struct mdoc *m, int line, int *pos, |
|
Line 374 args(struct mdoc *m, int line, int *pos, |
|
int i; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
|
|
/* |
|
* 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'. |
|
*/ |
|
|
assert(*pos); |
assert(*pos); |
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
|
|
Line 389 args(struct mdoc *m, int line, int *pos, |
|
Line 401 args(struct mdoc *m, int line, int *pos, |
|
* follows the pattern of [[::delim::][ ]+]+. |
* follows the pattern of [[::delim::][ ]+]+. |
*/ |
*/ |
|
|
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) { |
for (i = *pos; buf[i]; ) { |
for (i = *pos; buf[i]; ) { |
if ( ! mdoc_iscdelim(buf[i])) |
if ( mdoc_iscdelim(buf[i]) < 2) |
break; |
break; |
i++; |
i++; |
if (0 == buf[i] || ' ' != buf[i]) |
if (0 == buf[i] || ' ' != buf[i]) |
Line 401 args(struct mdoc *m, int line, int *pos, |
|
Line 413 args(struct mdoc *m, int line, int *pos, |
|
i++; |
i++; |
} |
} |
|
|
/* FIXME: warn about trailing whitespace. */ |
|
|
|
if (0 == buf[i]) { |
if (0 == buf[i]) { |
*v = &buf[*pos]; |
*v = &buf[*pos]; |
|
if (' ' != buf[i - 1]) |
|
return(ARGS_PUNCT); |
|
if (ARGS_NOWARN & fl) |
|
return(ARGS_PUNCT); |
|
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
|
return(ARGS_ERROR); |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
} |
} |
} |
Line 448 args(struct mdoc *m, int line, int *pos, |
|
Line 464 args(struct mdoc *m, int line, int *pos, |
|
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)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
Line 488 args(struct mdoc *m, int line, int *pos, |
|
Line 504 args(struct mdoc *m, int line, int *pos, |
|
} |
} |
|
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
|
if (ARGS_NOWARN & fl) |
|
return(ARGS_QWORD); |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
Line 501 args(struct mdoc *m, int line, int *pos, |
|
Line 519 args(struct mdoc *m, int line, int *pos, |
|
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)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
Line 525 args(struct mdoc *m, int line, int *pos, |
|
Line 543 args(struct mdoc *m, int line, int *pos, |
|
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)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
Line 534 args(struct mdoc *m, int line, int *pos, |
|
Line 552 args(struct mdoc *m, int line, int *pos, |
|
|
|
|
|
static int |
static int |
argv_a2arg(int tok, const char *argv) |
argv_a2arg(int tok, const char *p) |
{ |
{ |
|
|
/* |
/* |
Line 547 argv_a2arg(int tok, const char *argv) |
|
Line 565 argv_a2arg(int tok, const char *argv) |
|
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_An): |
case (MDOC_An): |
if (0 == strcmp(argv, "split")) |
if (0 == strcmp(p, "split")) |
return(MDOC_Split); |
return(MDOC_Split); |
else if (0 == strcmp(argv, "nosplit")) |
else if (0 == strcmp(p, "nosplit")) |
return(MDOC_Nosplit); |
return(MDOC_Nosplit); |
break; |
break; |
|
|
case (MDOC_Bd): |
case (MDOC_Bd): |
if (0 == strcmp(argv, "ragged")) |
if (0 == strcmp(p, "ragged")) |
return(MDOC_Ragged); |
return(MDOC_Ragged); |
else if (0 == strcmp(argv, "unfilled")) |
else if (0 == strcmp(p, "unfilled")) |
return(MDOC_Unfilled); |
return(MDOC_Unfilled); |
else if (0 == strcmp(argv, "filled")) |
else if (0 == strcmp(p, "filled")) |
return(MDOC_Filled); |
return(MDOC_Filled); |
else if (0 == strcmp(argv, "literal")) |
else if (0 == strcmp(p, "literal")) |
return(MDOC_Literal); |
return(MDOC_Literal); |
else if (0 == strcmp(argv, "file")) |
else if (0 == strcmp(p, "file")) |
return(MDOC_File); |
return(MDOC_File); |
else if (0 == strcmp(argv, "offset")) |
else if (0 == strcmp(p, "offset")) |
return(MDOC_Offset); |
return(MDOC_Offset); |
else if (0 == strcmp(argv, "compact")) |
else if (0 == strcmp(p, "compact")) |
return(MDOC_Compact); |
return(MDOC_Compact); |
|
else if (0 == strcmp(p, "centered")) |
|
return(MDOC_Centred); |
break; |
break; |
|
|
case (MDOC_Bf): |
case (MDOC_Bf): |
if (0 == strcmp(argv, "emphasis")) |
if (0 == strcmp(p, "emphasis")) |
return(MDOC_Emphasis); |
return(MDOC_Emphasis); |
else if (0 == strcmp(argv, "literal")) |
else if (0 == strcmp(p, "literal")) |
return(MDOC_Literal); |
return(MDOC_Literal); |
else if (0 == strcmp(argv, "symbolic")) |
else if (0 == strcmp(p, "symbolic")) |
return(MDOC_Symbolic); |
return(MDOC_Symbolic); |
break; |
break; |
|
|
case (MDOC_Bk): |
case (MDOC_Bk): |
if (0 == strcmp(argv, "words")) |
if (0 == strcmp(p, "words")) |
return(MDOC_Words); |
return(MDOC_Words); |
break; |
break; |
|
|
case (MDOC_Bl): |
case (MDOC_Bl): |
if (0 == strcmp(argv, "bullet")) |
if (0 == strcmp(p, "bullet")) |
return(MDOC_Bullet); |
return(MDOC_Bullet); |
else if (0 == strcmp(argv, "dash")) |
else if (0 == strcmp(p, "dash")) |
return(MDOC_Dash); |
return(MDOC_Dash); |
else if (0 == strcmp(argv, "hyphen")) |
else if (0 == strcmp(p, "hyphen")) |
return(MDOC_Hyphen); |
return(MDOC_Hyphen); |
else if (0 == strcmp(argv, "item")) |
else if (0 == strcmp(p, "item")) |
return(MDOC_Item); |
return(MDOC_Item); |
else if (0 == strcmp(argv, "enum")) |
else if (0 == strcmp(p, "enum")) |
return(MDOC_Enum); |
return(MDOC_Enum); |
else if (0 == strcmp(argv, "tag")) |
else if (0 == strcmp(p, "tag")) |
return(MDOC_Tag); |
return(MDOC_Tag); |
else if (0 == strcmp(argv, "diag")) |
else if (0 == strcmp(p, "diag")) |
return(MDOC_Diag); |
return(MDOC_Diag); |
else if (0 == strcmp(argv, "hang")) |
else if (0 == strcmp(p, "hang")) |
return(MDOC_Hang); |
return(MDOC_Hang); |
else if (0 == strcmp(argv, "ohang")) |
else if (0 == strcmp(p, "ohang")) |
return(MDOC_Ohang); |
return(MDOC_Ohang); |
else if (0 == strcmp(argv, "inset")) |
else if (0 == strcmp(p, "inset")) |
return(MDOC_Inset); |
return(MDOC_Inset); |
else if (0 == strcmp(argv, "column")) |
else if (0 == strcmp(p, "column")) |
return(MDOC_Column); |
return(MDOC_Column); |
else if (0 == strcmp(argv, "width")) |
else if (0 == strcmp(p, "width")) |
return(MDOC_Width); |
return(MDOC_Width); |
else if (0 == strcmp(argv, "offset")) |
else if (0 == strcmp(p, "offset")) |
return(MDOC_Offset); |
return(MDOC_Offset); |
else if (0 == strcmp(argv, "compact")) |
else if (0 == strcmp(p, "compact")) |
return(MDOC_Compact); |
return(MDOC_Compact); |
else if (0 == strcmp(argv, "nested")) |
else if (0 == strcmp(p, "nested")) |
return(MDOC_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")) |
if (0 == strcmp(p, "std")) |
return(MDOC_Std); |
return(MDOC_Std); |
break; |
break; |
default: |
default: |
Line 647 argv_multi(struct mdoc *m, int line, |
|
Line 667 argv_multi(struct mdoc *m, int line, |
|
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == c) |
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); |
Line 680 argv_opt_single(struct mdoc *m, int line, |
|
Line 695 argv_opt_single(struct mdoc *m, int line, |
|
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); |
} |
} |
Line 708 argv_single(struct mdoc *m, int line, |
|
Line 721 argv_single(struct mdoc *m, int line, |
|
return(mdoc_perr(m, line, ppos, EARGVAL)); |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
|
|
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); |
} |
} |