version 1.35, 2009/01/14 11:58:24 |
version 1.36, 2009/01/15 15:46:45 |
Line 42 static int rewind_dobreak(int, enum mdoc_type, |
|
Line 42 static int rewind_dobreak(int, enum mdoc_type, |
|
static int rewind_elem(struct mdoc *, int); |
static int rewind_elem(struct mdoc *, int); |
static int rewind_impblock(struct mdoc *, int); |
static int rewind_impblock(struct mdoc *, int); |
static int rewind_expblock(struct mdoc *, int); |
static int rewind_expblock(struct mdoc *, int); |
static int rewind_head(struct mdoc *, int); |
static int rewind_subblock(enum mdoc_type, struct mdoc *, int); |
static int rewind_body(struct mdoc *, int); |
static int rewind_last(int, int, |
static int rewind_last(struct mdoc *, struct mdoc_node *); |
struct mdoc *, struct mdoc_node *); |
static int append_delims(struct mdoc *, |
static int append_delims(struct mdoc *, |
int, int, int *, char *); |
int, int, int *, char *); |
static int lookup(struct mdoc *, int, int, int, const char *); |
static int lookup(struct mdoc *, int, int, int, const char *); |
Line 68 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
Line 68 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
|
|
|
|
static int |
static int |
rewind_last(struct mdoc *mdoc, struct mdoc_node *to) |
rewind_last(int tok, int type, struct mdoc *mdoc, struct mdoc_node *to) |
{ |
{ |
|
|
assert(to); |
assert(to); |
Line 78 rewind_last(struct mdoc *mdoc, struct mdoc_node *to) |
|
Line 78 rewind_last(struct mdoc *mdoc, struct mdoc_node *to) |
|
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
if ( ! mdoc_action_post(mdoc)) |
return(0); |
return(0); |
mdoc_msg(mdoc, "rewound to %s %s", |
mdoc_msg(mdoc, "rewound %s %s to %s %s", |
|
mdoc_type2a(type), |
|
mdoc_macronames[tok], |
mdoc_type2a(mdoc->last->type), |
mdoc_type2a(mdoc->last->type), |
mdoc_macronames[mdoc->last->tok]); |
mdoc_macronames[mdoc->last->tok]); |
return(1); |
return(1); |
Line 91 rewind_last(struct mdoc *mdoc, struct mdoc_node *to) |
|
Line 93 rewind_last(struct mdoc *mdoc, struct mdoc_node *to) |
|
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
if ( ! mdoc_action_post(mdoc)) |
return(0); |
return(0); |
mdoc_msg(mdoc, "rewound to %s %s", |
mdoc_msg(mdoc, "rewound %s %s to %s %s", |
|
mdoc_type2a(type), |
|
mdoc_macronames[tok], |
mdoc_type2a(mdoc->last->type), |
mdoc_type2a(mdoc->last->type), |
mdoc_macronames[mdoc->last->tok]); |
mdoc_macronames[mdoc->last->tok]); |
} while (mdoc->last != to); |
} while (mdoc->last != to); |
Line 185 rewind_dohalt(int tok, enum mdoc_type type, const stru |
|
Line 189 rewind_dohalt(int tok, enum mdoc_type type, const stru |
|
assert(MDOC_TAIL != type); |
assert(MDOC_TAIL != type); |
if (type == p->type && tok == p->tok) |
if (type == p->type && tok == p->tok) |
return(REWIND_REWIND); |
return(REWIND_REWIND); |
if (MDOC_BLOCK == type && MDOC_BODY == p->type && |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
MDOC_Bl == p->tok) |
|
return(REWIND_HALT); |
return(REWIND_HALT); |
break; |
break; |
case (MDOC_Sh): |
case (MDOC_Sh): |
/* FALLTHROUGH */ |
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
break; |
case (MDOC_Ss): |
case (MDOC_Ss): |
|
assert(MDOC_TAIL != type); |
if (type == p->type && tok == p->tok) |
if (type == p->type && tok == p->tok) |
return(REWIND_REWIND); |
return(REWIND_REWIND); |
|
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
|
return(REWIND_HALT); |
break; |
break; |
|
|
/* Multi-line explicit scope start. */ |
/* Multi-line explicit scope start. */ |
Line 283 rewind_dobreak(int tok, enum mdoc_type type, const str |
|
Line 291 rewind_dobreak(int tok, enum mdoc_type type, const str |
|
return(1); |
return(1); |
|
|
switch (tok) { |
switch (tok) { |
|
/* Implicit rules. */ |
case (MDOC_It): |
case (MDOC_It): |
return(MDOC_It == p->tok); |
return(MDOC_It == p->tok); |
case (MDOC_Ss): |
case (MDOC_Ss): |
Line 291 rewind_dobreak(int tok, enum mdoc_type type, const str |
|
Line 300 rewind_dobreak(int tok, enum mdoc_type type, const str |
|
if (MDOC_Ss == p->tok) |
if (MDOC_Ss == p->tok) |
return(1); |
return(1); |
return(MDOC_Sh == p->tok); |
return(MDOC_Sh == p->tok); |
|
|
|
/* Extra scope rules. */ |
|
case (MDOC_El): |
|
if (MDOC_It == p->tok) |
|
return(1); |
|
break; |
|
default: |
|
break; |
} |
} |
|
|
if (MDOC_EXPLICIT & mdoc_macros[tok].flags) |
if (MDOC_EXPLICIT & mdoc_macros[tok].flags) |
Line 313 rewind_elem(struct mdoc *mdoc, int tok) |
|
Line 330 rewind_elem(struct mdoc *mdoc, int tok) |
|
assert(MDOC_ELEM == n->type); |
assert(MDOC_ELEM == n->type); |
assert(tok == n->tok); |
assert(tok == n->tok); |
|
|
return(rewind_last(mdoc, n)); |
return(rewind_last(tok, MDOC_ELEM, mdoc, n)); |
} |
} |
|
|
|
|
static int |
static int |
rewind_body(struct mdoc *mdoc, int tok) |
rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, int tok) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
int c; |
|
|
/* LINTED */ |
c = rewind_dohalt(tok, type, mdoc->last); |
for (n = mdoc->last; n; n = n->parent) { |
if (REWIND_HALT == c) |
c = rewind_dohalt(tok, MDOC_BODY, n); |
return(1); |
if (REWIND_HALT == c) |
if (REWIND_REWIND == c) |
return(1); |
return(rewind_last(tok, type, mdoc, mdoc->last)); |
if (REWIND_REWIND == c) |
|
break; |
|
else if (rewind_dobreak(tok, MDOC_BODY, n)) |
|
continue; |
|
return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); |
|
} |
|
|
|
assert(n); |
|
return(rewind_last(mdoc, n)); |
|
} |
|
|
|
|
|
static int |
|
rewind_head(struct mdoc *mdoc, int tok) |
|
{ |
|
struct mdoc_node *n; |
|
int c; |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last->parent; n; n = n->parent) { |
c = rewind_dohalt(tok, MDOC_HEAD, n); |
c = rewind_dohalt(tok, type, n); |
if (REWIND_HALT == c) |
if (REWIND_HALT == c) |
return(1); |
return(1); |
if (REWIND_REWIND == c) |
if (REWIND_REWIND == c) |
break; |
break; |
else if (rewind_dobreak(tok, MDOC_HEAD, n)) |
else if (rewind_dobreak(tok, type, n)) |
continue; |
continue; |
return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); |
return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); |
} |
} |
|
|
assert(n); |
assert(n); |
return(rewind_last(mdoc, n)); |
return(rewind_last(tok, type, mdoc, n)); |
} |
} |
|
|
|
|
Line 369 rewind_expblock(struct mdoc *mdoc, int tok) |
|
Line 369 rewind_expblock(struct mdoc *mdoc, int tok) |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
int c; |
|
|
|
c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); |
|
if (REWIND_HALT == c) |
|
return(mdoc_err(mdoc, ERR_SCOPE_NOCTX)); |
|
if (REWIND_REWIND == c) |
|
return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last->parent; n; n = n->parent) { |
c = rewind_dohalt(tok, MDOC_BLOCK, n); |
c = rewind_dohalt(tok, MDOC_BLOCK, n); |
if (REWIND_HALT == c) |
if (REWIND_HALT == c) |
return(mdoc_err(mdoc, ERR_SCOPE_NOCTX)); |
return(mdoc_err(mdoc, ERR_SCOPE_NOCTX)); |
Line 382 rewind_expblock(struct mdoc *mdoc, int tok) |
|
Line 388 rewind_expblock(struct mdoc *mdoc, int tok) |
|
} |
} |
|
|
assert(n); |
assert(n); |
return(rewind_last(mdoc, n)); |
return(rewind_last(tok, MDOC_BLOCK, mdoc, n)); |
} |
} |
|
|
|
|
Line 392 rewind_impblock(struct mdoc *mdoc, int tok) |
|
Line 398 rewind_impblock(struct mdoc *mdoc, int tok) |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
int c; |
|
|
|
printf("1\n"); |
|
c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); |
|
if (REWIND_HALT == c) |
|
return(1); |
|
if (REWIND_REWIND == c) |
|
return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last->parent; n; n = n->parent) { |
c = rewind_dohalt(tok, MDOC_BLOCK, n); |
c = rewind_dohalt(tok, MDOC_BLOCK, n); |
if (REWIND_HALT == c) |
if (REWIND_HALT == c) |
return(1); |
return(1); |
Line 405 rewind_impblock(struct mdoc *mdoc, int tok) |
|
Line 418 rewind_impblock(struct mdoc *mdoc, int tok) |
|
} |
} |
|
|
assert(n); |
assert(n); |
return(rewind_last(mdoc, n)); |
return(rewind_last(tok, MDOC_BLOCK, mdoc, n)); |
} |
} |
|
|
|
|
Line 454 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 467 macro_scoped_close(MACRO_PROT_ARGS) |
|
|
|
tt = rewind_alt(tok); |
tt = rewind_alt(tok); |
|
|
|
mdoc_msg(mdoc, "parse-quiet: %s closing %s", |
|
mdoc_macronames[tok], mdoc_macronames[tt]); |
|
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
if ( ! rewind_body(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
return(0); |
return(0); |
return(rewind_expblock(mdoc, tok)); |
return(rewind_expblock(mdoc, tok)); |
} |
} |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0)); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0)); |
} |
} |
|
|
if ( ! rewind_body(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
return(0); |
return(0); |
|
|
lastarg = ppos; |
lastarg = ppos; |
Line 574 macro_text(MACRO_PROT_ARGS) |
|
Line 590 macro_text(MACRO_PROT_ARGS) |
|
for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { |
for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { |
la = *pos; |
la = *pos; |
|
|
if (lastpunct) { |
|
c = mdoc_elem_alloc(mdoc, line, |
|
la, tok, argc, argv); |
|
if (0 == c) { |
|
mdoc_argv_free(argc, argv); |
|
return(0); |
|
} |
|
mdoc->next = MDOC_NEXT_CHILD; |
|
lastpunct = 0; |
|
} |
|
|
|
c = mdoc_args(mdoc, line, pos, buf, fl, &p); |
c = mdoc_args(mdoc, line, pos, buf, fl, &p); |
if (ARGS_ERROR == c) { |
if (ARGS_ERROR == c) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
Line 599 macro_text(MACRO_PROT_ARGS) |
|
Line 604 macro_text(MACRO_PROT_ARGS) |
|
if (-1 == (c = lookup(mdoc, line, la, tok, p))) |
if (-1 == (c = lookup(mdoc, line, la, tok, p))) |
return(0); |
return(0); |
else if (MDOC_MAX != c) { |
else if (MDOC_MAX != c) { |
if ( ! rewind_elem(mdoc, tok)) { |
if (0 == lastpunct && ! rewind_elem(mdoc, tok)) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
} |
} |
Line 614 macro_text(MACRO_PROT_ARGS) |
|
Line 619 macro_text(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (mdoc_isdelim(p)) { |
if (mdoc_isdelim(p)) { |
if ( ! rewind_elem(mdoc, tok)) { |
if (0 == lastpunct && ! rewind_elem(mdoc, tok)) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
} |
} |
lastpunct = 1; |
lastpunct = 1; |
|
} else if (lastpunct) { |
|
c = mdoc_elem_alloc(mdoc, line, |
|
la, tok, argc, argv); |
|
if (0 == c) { |
|
mdoc_argv_free(argc, argv); |
|
return(0); |
|
} |
|
mdoc->next = MDOC_NEXT_CHILD; |
|
lastpunct = 0; |
} |
} |
|
|
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
Line 630 macro_text(MACRO_PROT_ARGS) |
|
Line 645 macro_text(MACRO_PROT_ARGS) |
|
if (sz == MDOC_LINEARG_MAX) |
if (sz == MDOC_LINEARG_MAX) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
|
|
if ( ! rewind_elem(mdoc, tok)) |
if (0 == lastpunct && ! rewind_elem(mdoc, tok)) |
return(0); |
return(0); |
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
Line 651 macro_scoped(MACRO_PROT_ARGS) |
|
Line 666 macro_scoped(MACRO_PROT_ARGS) |
|
assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! rewind_body(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
return(0); |
return(0); |
if ( ! rewind_impblock(mdoc, tok)) |
if ( ! rewind_impblock(mdoc, tok)) |
return(0); |
return(0); |
Line 685 macro_scoped(MACRO_PROT_ARGS) |
|
Line 700 macro_scoped(MACRO_PROT_ARGS) |
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
Line 729 macro_scoped(MACRO_PROT_ARGS) |
|
Line 744 macro_scoped(MACRO_PROT_ARGS) |
|
if (j == MDOC_LINEARG_MAX) |
if (j == MDOC_LINEARG_MAX) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
|
|
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf)) |
if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf)) |
return(0); |
return(0); |
Line 792 macro_scoped_line(MACRO_PROT_ARGS) |
|
Line 807 macro_scoped_line(MACRO_PROT_ARGS) |
|
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
|
|
if (1 == ppos) { |
if (1 == ppos) { |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
if ( ! append_delims(mdoc, tok, line, pos, buf)) |
if ( ! append_delims(mdoc, tok, line, pos, buf)) |
return(0); |
return(0); |
} |
} else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
if ( ! rewind_head(mdoc, tok)) |
|
return(0); |
return(0); |
return(rewind_impblock(mdoc, tok)); |
return(rewind_impblock(mdoc, tok)); |
} |
} |
Line 832 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 846 macro_constant_scoped(MACRO_PROT_ARGS) |
|
if (0 == maxargs) { |
if (0 == maxargs) { |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
Line 846 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 860 macro_constant_scoped(MACRO_PROT_ARGS) |
|
lastarg = *pos; |
lastarg = *pos; |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
Line 866 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 880 macro_constant_scoped(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
else if (MDOC_MAX != c) { |
else if (MDOC_MAX != c) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
Line 879 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 893 macro_constant_scoped(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if ( ! flushed && mdoc_isdelim(p)) { |
if ( ! flushed && mdoc_isdelim(p)) { |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
Line 896 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 910 macro_constant_scoped(MACRO_PROT_ARGS) |
|
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
|
|
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rewind_head(mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
Line 1087 macro_end(struct mdoc *mdoc) |
|
Line 1101 macro_end(struct mdoc *mdoc) |
|
|
|
assert(mdoc->first); |
assert(mdoc->first); |
assert(mdoc->last); |
assert(mdoc->last); |
return(rewind_last(mdoc, mdoc->first)); |
return(rewind_last(mdoc->last->tok, mdoc->last->type, |
|
mdoc, mdoc->first)); |
} |
} |