version 1.114, 2010/01/01 17:14:29 |
version 1.118, 2010/03/31 07:42:04 |
Line 143 const char * const *mdoc_argnames = __mdoc_argnames; |
|
Line 143 const char * const *mdoc_argnames = __mdoc_argnames; |
|
static void mdoc_free1(struct mdoc *); |
static void mdoc_free1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
int, enum mdoc_type); |
enum mdoct, enum mdoc_type); |
static int node_append(struct mdoc *, |
static int node_append(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
static int parsetext(struct mdoc *, int, char *); |
static int parsetext(struct mdoc *, int, char *); |
Line 341 mdoc_err(struct mdoc *m, int line, int pos, int iserr, |
|
Line 341 mdoc_err(struct mdoc *m, int line, int pos, int iserr, |
|
|
|
|
|
int |
int |
mdoc_macro(struct mdoc *m, int tok, |
mdoc_macro(struct mdoc *m, enum mdoct tok, |
int ln, int pp, int *pos, char *buf) |
int ln, int pp, int *pos, char *buf) |
{ |
{ |
|
|
|
assert(tok < MDOC_MAX); |
/* |
/* |
* If we're in the prologue, deny "body" macros. Similarly, if |
* If we're in the prologue, deny "body" macros. Similarly, if |
* we're in the body, deny prologue calls. |
* we're in the body, deny prologue calls. |
Line 424 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 426 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
|
|
static struct mdoc_node * |
static struct mdoc_node * |
node_alloc(struct mdoc *m, int line, |
node_alloc(struct mdoc *m, int line, int pos, |
int pos, int tok, enum mdoc_type type) |
enum mdoct tok, enum mdoc_type type) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
Line 434 node_alloc(struct mdoc *m, int line, |
|
Line 436 node_alloc(struct mdoc *m, int line, |
|
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->tok = tok; |
p->tok = tok; |
if (MDOC_TEXT != (p->type = type)) |
p->type = type; |
assert(p->tok >= 0); |
|
|
|
return(p); |
return(p); |
} |
} |
|
|
|
|
int |
int |
mdoc_tail_alloc(struct mdoc *m, int line, int pos, int tok) |
mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
Line 455 mdoc_tail_alloc(struct mdoc *m, int line, int pos, int |
|
Line 456 mdoc_tail_alloc(struct mdoc *m, int line, int pos, int |
|
|
|
|
|
int |
int |
mdoc_head_alloc(struct mdoc *m, int line, int pos, int tok) |
mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
Line 471 mdoc_head_alloc(struct mdoc *m, int line, int pos, int |
|
Line 472 mdoc_head_alloc(struct mdoc *m, int line, int pos, int |
|
|
|
|
|
int |
int |
mdoc_body_alloc(struct mdoc *m, int line, int pos, int tok) |
mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
Line 485 mdoc_body_alloc(struct mdoc *m, int line, int pos, int |
|
Line 486 mdoc_body_alloc(struct mdoc *m, int line, int pos, int |
|
|
|
int |
int |
mdoc_block_alloc(struct mdoc *m, int line, int pos, |
mdoc_block_alloc(struct mdoc *m, int line, int pos, |
int tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
Line 502 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
Line 503 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
|
|
int |
int |
mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
int tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
|
|
parsetext(struct mdoc *m, int line, char *buf) |
parsetext(struct mdoc *m, int line, char *buf) |
{ |
{ |
int i, j; |
int i, j; |
|
char sv; |
|
|
if (SEC_NONE == m->lastnamed) |
if (SEC_NONE == m->lastnamed) |
return(mdoc_perr(m, line, 0, ETEXTPROL)); |
return(mdoc_perr(m, line, 0, ETEXTPROL)); |
Line 597 parsetext(struct mdoc *m, int line, char *buf) |
|
Line 599 parsetext(struct mdoc *m, int line, char *buf) |
|
|
|
for (i = 0; ' ' == buf[i]; i++) |
for (i = 0; ' ' == buf[i]; i++) |
/* Skip leading whitespace. */ ; |
/* Skip leading whitespace. */ ; |
if (0 == buf[i]) |
|
|
if ('\0' == buf[i]) |
return(mdoc_perr(m, line, 0, ENOBLANK)); |
return(mdoc_perr(m, line, 0, ENOBLANK)); |
|
|
/* |
/* |
Line 613 parsetext(struct mdoc *m, int line, char *buf) |
|
Line 616 parsetext(struct mdoc *m, int line, char *buf) |
|
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
continue; |
continue; |
|
|
buf[i++] = 0; |
sv = buf[i]; |
|
buf[i++] = '\0'; |
|
|
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
return(0); |
return(0); |
|
|
|
/* Trailing whitespace? Check at overwritten byte. */ |
|
|
|
if (' ' == sv && '\0' == buf[i]) |
|
if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS)) |
|
return(0); |
|
|
for ( ; ' ' == buf[i]; i++) |
for ( ; ' ' == buf[i]; i++) |
/* Skip trailing whitespace. */ ; |
/* Skip trailing whitespace. */ ; |
|
|
j = i; |
j = i; |
if (0 == buf[i]) |
|
|
/* Trailing whitespace? */ |
|
|
|
if (' ' == buf[i - 1] && '\0' == buf[i]) |
|
if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS)) |
|
return(0); |
|
|
|
if ('\0' == buf[i]) |
break; |
break; |
} |
} |
|
|
Line 658 parsemacro(struct mdoc *m, int ln, char *buf) |
|
Line 676 parsemacro(struct mdoc *m, int ln, char *buf) |
|
|
|
/* Empty lines are ignored. */ |
/* Empty lines are ignored. */ |
|
|
if (0 == buf[1]) |
if ('\0' == buf[1]) |
return(1); |
return(1); |
|
|
i = 1; |
i = 1; |
Line 669 parsemacro(struct mdoc *m, int ln, char *buf) |
|
Line 687 parsemacro(struct mdoc *m, int ln, char *buf) |
|
i++; |
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
if (0 == buf[i]) |
if ('\0' == buf[i]) |
return(1); |
return(1); |
} |
} |
|
|
/* Copy the first word into a nil-terminated buffer. */ |
/* Copy the first word into a nil-terminated buffer. */ |
|
|
for (j = 0; j < 4; j++, i++) { |
for (j = 0; j < 4; j++, i++) { |
if (0 == (mac[j] = buf[i])) |
if ('\0' == (mac[j] = buf[i])) |
break; |
break; |
else if (' ' == buf[i]) |
else if (' ' == buf[i]) |
break; |
break; |
Line 706 parsemacro(struct mdoc *m, int ln, char *buf) |
|
Line 724 parsemacro(struct mdoc *m, int ln, char *buf) |
|
|
|
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
|
|
|
/* Trailing whitespace? */ |
|
|
|
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
|
if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS)) |
|
goto err; |
|
|
/* |
/* |
* Begin recursive parse sequence. Since we're at the start of |
* Begin recursive parse sequence. Since we're at the start of |