version 1.26, 2009/09/24 13:03:32 |
version 1.31, 2009/10/28 19:21:59 |
|
|
#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 |
Line 59 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 60 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_OPT_SINGLE, /* MDOC_Offset */ |
ARGV_OPT_SINGLE, /* MDOC_Offset */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Dash */ |
ARGV_NONE, /* MDOC_Dash */ |
Line 203 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 204 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* %Q */ |
0, /* %Q */ |
0, /* br */ |
0, /* br */ |
0, /* sp */ |
0, /* sp */ |
|
0, /* %U */ |
}; |
}; |
|
|
|
|
Line 265 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 267 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 = 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 557 args(struct mdoc *m, int line, int *pos, |
|
Line 548 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 570 argv_a2arg(int tok, const char *argv) |
|
Line 561 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 670 argv_multi(struct mdoc *m, int line, |
|
Line 663 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 703 argv_opt_single(struct mdoc *m, int line, |
|
Line 691 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 731 argv_single(struct mdoc *m, int line, |
|
Line 717 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); |
} |
} |