version 1.99, 2010/12/15 23:39:40 |
version 1.107, 2011/04/19 16:38:48 |
|
|
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
|
#include "mdoc.h" |
#include "mandoc.h" |
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
Line 50 static int in_line(MACRO_PROT_ARGS); |
|
Line 51 static int in_line(MACRO_PROT_ARGS); |
|
static int obsolete(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
static int phrase_ta(MACRO_PROT_ARGS); |
static int phrase_ta(MACRO_PROT_ARGS); |
|
|
|
static int dword(struct mdoc *, int, int, |
|
const char *, enum mdelim); |
static int append_delims(struct mdoc *, |
static int append_delims(struct mdoc *, |
int, int *, char *); |
int, int *, char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup(enum mdoct, const char *); |
Line 252 lookup_raw(const char *p) |
|
Line 255 lookup_raw(const char *p) |
|
static int |
static int |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n, *np; |
|
|
assert(to); |
assert(to); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
/* LINTED */ |
/* LINTED */ |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
|
/* |
|
* Save the parent here, because we may delete the |
|
* m->last node in the post-validation phase and reset |
|
* it to m->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
np = mdoc->last->parent; |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
n = mdoc->last; |
n = mdoc->last; |
mdoc->last = mdoc->last->parent; |
mdoc->last = np; |
assert(mdoc->last); |
assert(mdoc->last); |
mdoc->last->last = n; |
mdoc->last->last = n; |
} |
} |
Line 506 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 516 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
taker->pending = broken->pending; |
taker->pending = broken->pending; |
} |
} |
broken->pending = breaker; |
broken->pending = breaker; |
mdoc_vmsg(m, MANDOCERR_SCOPENEST, line, ppos, |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, |
"%s breaks %s", mdoc_macronames[tok], |
"%s breaks %s", mdoc_macronames[tok], |
mdoc_macronames[broken->tok]); |
mdoc_macronames[broken->tok]); |
return(1); |
return(1); |
} |
} |
|
|
Line 534 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 544 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
case (REWIND_THIS): |
case (REWIND_THIS): |
break; |
break; |
case (REWIND_FORCE): |
case (REWIND_FORCE): |
mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos, |
mandoc_vmsg(MANDOCERR_SCOPEBROKEN, m->parse, |
"%s breaks %s", mdoc_macronames[tok], |
line, ppos, "%s breaks %s", |
mdoc_macronames[n->tok]); |
mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (REWIND_MORE): |
case (REWIND_MORE): |
n = n->parent; |
n = n->parent; |
Line 572 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 583 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* Allocate a word and check whether it's punctuation or not. |
|
* Punctuation consists of those tokens found in mdoc_isdelim(). |
|
*/ |
|
static int |
|
dword(struct mdoc *m, int line, |
|
int col, const char *p, enum mdelim d) |
|
{ |
|
|
|
if (DELIM_MAX == d) |
|
d = mdoc_isdelim(p); |
|
|
|
if ( ! mdoc_word_alloc(m, line, col, p)) |
|
return(0); |
|
|
|
if (DELIM_OPEN == d) |
|
m->last->flags |= MDOC_DELIMO; |
|
else if (DELIM_CLOSE == d) |
|
m->last->flags |= MDOC_DELIMC; |
|
|
|
return(1); |
|
} |
|
|
static int |
static int |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
{ |
{ |
Line 585 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 618 append_delims(struct mdoc *m, int line, int *pos, char |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(m, line, pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(DELIM_NONE != mdoc_isdelim(p)); |
dword(m, line, la, p, DELIM_MAX); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
|
|
/* |
/* |
* If we encounter end-of-sentence symbols, then trigger |
* If we encounter end-of-sentence symbols, then trigger |
Line 703 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 734 blk_exp_close(MACRO_PROT_ARGS) |
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
/* FIXME: do this in validate */ |
/* FIXME: do this in validate */ |
if (buf[*pos]) |
if (buf[*pos]) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST); |
return(0); |
|
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 739 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 769 blk_exp_close(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
if ( ! dword(m, line, lastarg, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 847 in_line(MACRO_PROT_ARGS) |
|
Line 877 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
return(0); |
|
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
if ( ! nl) |
if ( ! nl) |
Line 898 in_line(MACRO_PROT_ARGS) |
|
Line 928 in_line(MACRO_PROT_ARGS) |
|
|
|
if (DELIM_NONE == d) |
if (DELIM_NONE == d) |
cnt++; |
cnt++; |
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
|
if ( ! dword(m, line, la, p, d)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 929 in_line(MACRO_PROT_ARGS) |
|
Line 960 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
return(0); |
|
} |
} |
|
|
if ( ! nl) |
if ( ! nl) |
Line 1055 blk_full(MACRO_PROT_ARGS) |
|
Line 1085 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1107 blk_full(MACRO_PROT_ARGS) |
|
Line 1137 blk_full(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1217 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1247 blk_part_imp(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == body && ARGS_QWORD != ac && |
if (NULL == body && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1232 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1262 blk_part_imp(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1292 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1322 blk_part_imp(MACRO_PROT_ARGS) |
|
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* crufty use of `Op' breakage. |
* crufty use of `Op' breakage. |
*/ |
*/ |
if (n != body && ! mdoc_vmsg(m, MANDOCERR_SCOPENEST, |
if (n != body) |
line, ppos, "%s broken", mdoc_macronames[tok])) |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, |
return(0); |
"%s broken", mdoc_macronames[tok]); |
|
|
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 1348 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1378 blk_part_exp(MACRO_PROT_ARGS) |
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1371 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1401 blk_part_exp(MACRO_PROT_ARGS) |
|
assert(head); |
assert(head); |
/* No check whether it's a macro! */ |
/* No check whether it's a macro! */ |
if (MDOC_Eo == tok) |
if (MDOC_Eo == tok) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
Line 1389 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1419 blk_part_exp(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1454 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1484 in_line_argn(MACRO_PROT_ARGS) |
|
case (MDOC_Ux): |
case (MDOC_Ux): |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
|
case (MDOC_Bx): |
|
/* FALLTHROUGH */ |
case (MDOC_Xr): |
case (MDOC_Xr): |
maxargs = 2; |
maxargs = 2; |
break; |
break; |
Line 1492 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1524 in_line_argn(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && 0 == j && |
0 == j && DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} else if (0 == j) |
} else if (0 == j) |
Line 1544 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1576 in_line_argn(MACRO_PROT_ARGS) |
|
} |
} |
#endif |
#endif |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
j++; |
j++; |
} |
} |
Line 1615 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1647 in_line_eoln(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
obsolete(MACRO_PROT_ARGS) |
obsolete(MACRO_PROT_ARGS) |
{ |
{ |
|
|
return(mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS)); |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS); |
|
return(1); |
} |
} |
|
|
|
|
Line 1684 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1717 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
ac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
ac = mdoc_zargs(m, line, &pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1694 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1727 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1729 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1762 phrase_ta(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(m, line, pos, buf, 0, &p); |
ac = mdoc_zargs(m, line, pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1739 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1772 phrase_ta(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |