version 1.22, 2009/01/05 16:11:14 |
version 1.26, 2009/01/07 15:57:14 |
Line 34 static int rewind_impblock(struct mdoc *, int, int); |
|
Line 34 static int rewind_impblock(struct mdoc *, int, int); |
|
static int rewind_expblock(struct mdoc *, int, int, int); |
static int rewind_expblock(struct mdoc *, int, int, int); |
static int rewind_head(struct mdoc *, int, int); |
static int rewind_head(struct mdoc *, int, int); |
static int rewind_body(struct mdoc *, int, int, int); |
static int rewind_body(struct mdoc *, int, int, int); |
|
static int rewind_last(struct mdoc *, int, struct mdoc_node *); |
static int append_delims(struct mdoc *, int, int *, char *); |
static int append_delims(struct mdoc *, int, int *, char *); |
|
static int lookup(struct mdoc *, int, const char *); |
|
|
|
|
static int |
static int |
|
lookup(struct mdoc *mdoc, int from, const char *p) |
|
{ |
|
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
|
return(MDOC_MAX); |
|
return(mdoc_find(mdoc, p)); |
|
} |
|
|
|
|
|
static int |
|
rewind_last(struct mdoc *mdoc, int ppos, struct mdoc_node *to) |
|
{ |
|
|
|
assert(to); |
|
while (mdoc->last != to) { |
|
if ( ! mdoc_valid_post(mdoc, ppos)) |
|
return(0); |
|
if ( ! mdoc_action(mdoc, ppos)) |
|
return(0); |
|
mdoc->last = mdoc->last->parent; |
|
assert(mdoc->last); |
|
} |
|
mdoc->next = MDOC_NEXT_SIBLING; |
|
if ( ! mdoc_valid_post(mdoc, ppos)) |
|
return(0); |
|
return(mdoc_action(mdoc, ppos)); |
|
} |
|
|
|
|
|
static int |
rewind_elem(struct mdoc *mdoc, int ppos, int tok) |
rewind_elem(struct mdoc *mdoc, int ppos, int tok) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 48 rewind_elem(struct mdoc *mdoc, int ppos, int tok) |
|
Line 80 rewind_elem(struct mdoc *mdoc, int ppos, int tok) |
|
assert(MDOC_ELEM == n->type); |
assert(MDOC_ELEM == n->type); |
assert(tok == n->data.elem.tok); |
assert(tok == n->data.elem.tok); |
|
|
mdoc->last = n; |
return(rewind_last(mdoc, ppos, n)); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
if ( ! mdoc_valid_post(mdoc, tok, ppos)) |
|
return(0); |
|
return(mdoc_action(mdoc, tok, ppos)); |
|
} |
} |
|
|
|
|
|
|
rewind_body(struct mdoc *mdoc, int ppos, int tok, int tt) |
rewind_body(struct mdoc *mdoc, int ppos, int tok, int tt) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
int t; |
|
|
/* LINTED */ |
/* LINTED */ |
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
continue; |
continue; |
if (tt == n->data.head.tok) |
if (tt == (t = n->data.head.tok)) |
break; |
break; |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tt].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags)) |
continue; |
continue; |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
} |
} |
|
|
mdoc->last = n ? n : mdoc->last; |
assert(n); |
mdoc->next = MDOC_NEXT_SIBLING; |
return(rewind_last(mdoc, ppos, n)); |
/* XXX - no validation, we do this only for blocks/elements. */ |
|
return(1); |
|
} |
} |
|
|
|
|
Line 96 rewind_head(struct mdoc *mdoc, int ppos, int tok) |
|
Line 123 rewind_head(struct mdoc *mdoc, int ppos, int tok) |
|
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
} |
} |
|
|
mdoc->last = n ? n : mdoc->last; |
assert(n); |
mdoc->next = MDOC_NEXT_SIBLING; |
return(rewind_last(mdoc, ppos, n)); |
/* XXX - no validation, we do this only for blocks/elements. */ |
|
return(1); |
|
} |
} |
|
|
|
|
|
|
rewind_expblock(struct mdoc *mdoc, int ppos, int tok, int tt) |
rewind_expblock(struct mdoc *mdoc, int ppos, int tok, int tt) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
int t; |
|
|
assert(mdoc->last); |
assert(mdoc->last); |
|
|
Line 114 rewind_expblock(struct mdoc *mdoc, int ppos, int tok, |
|
Line 140 rewind_expblock(struct mdoc *mdoc, int ppos, int tok, |
|
for (n = mdoc->last->parent; n; n = n->parent) { |
for (n = mdoc->last->parent; n; n = n->parent) { |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
continue; |
continue; |
if (tt == n->data.block.tok) |
if (tt == (t = n->data.block.tok)) |
break; |
break; |
if (MDOC_NESTED & mdoc_macros[n->data.block.tok].flags) |
if (MDOC_NESTED & mdoc_macros[t].flags) |
continue; |
continue; |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
} |
} |
|
|
if (NULL == (mdoc->last = n)) |
if (NULL == n) |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX)); |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX)); |
|
return(rewind_last(mdoc, ppos, n)); |
mdoc->next = MDOC_NEXT_SIBLING; |
|
if ( ! mdoc_valid_post(mdoc, tok, ppos)) |
|
return(0); |
|
return(mdoc_action(mdoc, tok, ppos)); |
|
} |
} |
|
|
|
|
Line 147 rewind_impblock(struct mdoc *mdoc, int ppos, int tok) |
|
Line 169 rewind_impblock(struct mdoc *mdoc, int ppos, int tok) |
|
break; |
break; |
if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags)) |
continue; |
continue; |
|
if (MDOC_NESTED & mdoc_macros[tok].flags) |
|
return(1); |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); |
} |
} |
|
|
mdoc->last = n ? n : mdoc->last; |
if (NULL == n) |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
if ( ! mdoc_valid_post(mdoc, tok, ppos)) |
return(rewind_last(mdoc, ppos, n)); |
return(0); |
|
return(mdoc_action(mdoc, tok, ppos)); |
|
} |
} |
|
|
|
|
Line 215 macro_close_explicit(MACRO_PROT_ARGS) |
|
Line 237 macro_close_explicit(MACRO_PROT_ARGS) |
|
case (MDOC_El): |
case (MDOC_El): |
tt = MDOC_Bl; |
tt = MDOC_Bl; |
break; |
break; |
case (MDOC_Fo): |
case (MDOC_Fc): |
tt = MDOC_Fc; |
tt = MDOC_Fo; |
break; |
break; |
case (MDOC_Oc): |
case (MDOC_Oc): |
tt = MDOC_Oo; |
tt = MDOC_Oo; |
Line 286 macro_close_explicit(MACRO_PROT_ARGS) |
|
Line 308 macro_close_explicit(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rewind_expblock(mdoc, ppos, tok, tt)) |
if ( ! rewind_expblock(mdoc, ppos, tok, tt)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
Line 377 macro_text(MACRO_PROT_ARGS) |
|
Line 399 macro_text(MACRO_PROT_ARGS) |
|
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
if ( ! rewind_elem(mdoc, ppos, tok)) { |
if ( ! rewind_elem(mdoc, ppos, tok)) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
} |
} |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) |
return(0); |
return(0); |
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
Line 420 macro_text(MACRO_PROT_ARGS) |
|
Line 442 macro_text(MACRO_PROT_ARGS) |
|
int |
int |
macro_scoped(MACRO_PROT_ARGS) |
macro_scoped(MACRO_PROT_ARGS) |
{ |
{ |
int c, lastarg, argc; |
int c, lastarg, argc, j; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
|
char *p; |
|
|
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)) |
! (MDOC_NESTED & mdoc_macros[tok].flags)) |
|
if ( ! rewind_impblock(mdoc, ppos, tok)) |
if ( ! rewind_impblock(mdoc, ppos, tok)) |
return(0); |
return(0); |
|
|
Line 453 macro_scoped(MACRO_PROT_ARGS) |
|
Line 475 macro_scoped(MACRO_PROT_ARGS) |
|
|
|
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
|
|
/* XXX - Assumes header isn't parsed! */ |
if (0 == buf[*pos]) { |
|
|
if (0 != buf[*pos]) { |
|
mdoc_head_alloc(mdoc, ppos, tok); |
mdoc_head_alloc(mdoc, ppos, tok); |
|
if ( ! rewind_head(mdoc, ppos, tok)) |
|
return(0); |
|
mdoc_body_alloc(mdoc, ppos, tok); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
return(1); |
|
} |
|
|
mdoc_word_alloc(mdoc, lastarg, &buf[*pos]); |
mdoc_head_alloc(mdoc, ppos, tok); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
if ( ! rewind_head(mdoc, ppos, tok)) |
for (j = 0; j < MDOC_LINEARG_MAX; j++) { |
|
lastarg = *pos; |
|
c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p); |
|
|
|
if (ARGS_ERROR == c) |
return(0); |
return(0); |
|
if (ARGS_PUNCT == c) |
|
break; |
|
if (ARGS_EOLN == c) |
|
break; |
|
|
|
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
|
mdoc_word_alloc(mdoc, lastarg, p); |
|
mdoc->next = MDOC_NEXT_SIBLING; |
|
continue; |
|
} |
|
|
while (buf[*pos]) |
if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) |
(*pos)++; |
return(0); |
|
break; |
} |
} |
|
|
|
if (j == MDOC_LINEARG_MAX) |
|
return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); |
|
|
|
if ( ! rewind_head(mdoc, ppos, tok)) |
|
return(0); |
|
if (1 == ppos && ! append_delims(mdoc, tok, pos, buf)) |
|
return(0); |
|
|
mdoc_body_alloc(mdoc, ppos, tok); |
mdoc_body_alloc(mdoc, ppos, tok); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
Line 511 macro_scoped_line(MACRO_PROT_ARGS) |
|
Line 559 macro_scoped_line(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX == (c = mdoc_find(mdoc, p))) { |
if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { |
mdoc_word_alloc(mdoc, lastarg, p); |
mdoc_word_alloc(mdoc, lastarg, p); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
Line 560 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 608 macro_constant_scoped(MACRO_PROT_ARGS) |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
if (0 == maxargs) { |
if (0 == maxargs) { |
|
mdoc_head_alloc(mdoc, ppos, tok); |
|
if ( ! rewind_head(mdoc, ppos, tok)) |
|
return(0); |
mdoc_body_alloc(mdoc, ppos, tok); |
mdoc_body_alloc(mdoc, ppos, tok); |
flushed = 1; |
flushed = 1; |
} else |
} else |
Line 586 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 637 macro_constant_scoped(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rewind_head(mdoc, ppos, tok)) |
if ( ! rewind_head(mdoc, ppos, tok)) |
return(0); |
return(0); |
Line 594 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 645 macro_constant_scoped(MACRO_PROT_ARGS) |
|
mdoc_body_alloc(mdoc, ppos, tok); |
mdoc_body_alloc(mdoc, ppos, tok); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
Line 636 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 687 macro_constant_scoped(MACRO_PROT_ARGS) |
|
int |
int |
macro_constant_delimited(MACRO_PROT_ARGS) |
macro_constant_delimited(MACRO_PROT_ARGS) |
{ |
{ |
int lastarg, flushed, j, c, maxargs; |
int lastarg, flushed, j, c, maxargs, argc; |
|
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
char *p; |
char *p; |
|
|
lastarg = ppos; |
lastarg = ppos; |
Line 648 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 700 macro_constant_delimited(MACRO_PROT_ARGS) |
|
case (MDOC_Ns): |
case (MDOC_Ns): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ux): |
case (MDOC_Ux): |
|
/* FALLTHROUGH */ |
|
case (MDOC_St): |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
default: |
default: |
Line 655 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 709 macro_constant_delimited(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
mdoc_elem_alloc(mdoc, lastarg, tok, 0, NULL); |
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
|
lastarg = *pos; |
|
c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf); |
|
if (ARGV_EOLN == c || ARGV_WORD == c) |
|
break; |
|
else if (ARGV_ARG == c) |
|
continue; |
|
mdoc_argv_free(argc, argv); |
|
return(0); |
|
} |
|
|
|
if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) { |
|
mdoc_argv_free(argc, argv); |
|
return(0); |
|
} |
|
|
|
mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
|
mdoc_argv_free(argc, argv); |
|
|
for (j = 0; j < MDOC_LINEARG_MAX; j++) { |
for (j = 0; j < MDOC_LINEARG_MAX; j++) { |
lastarg = *pos; |
lastarg = *pos; |
|
|
Line 675 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 747 macro_constant_delimited(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { |
if (MDOC_MAX != (c = lookup(mdoc, tok, p))) { |
if ( ! flushed && ! rewind_elem(mdoc, ppos, tok)) |
if ( ! flushed && ! rewind_elem(mdoc, ppos, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
Line 717 macro_constant(MACRO_PROT_ARGS) |
|
Line 789 macro_constant(MACRO_PROT_ARGS) |
|
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
char *p; |
char *p; |
|
|
|
/*assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));*/ |
|
/*FIXME*/ |
|
|
fl = 0; |
fl = 0; |
if (MDOC_QUOTABLE & mdoc_macros[tok].flags) |
if (MDOC_QUOTABLE & mdoc_macros[tok].flags) |
fl = ARGS_QUOTED; |
fl = ARGS_QUOTED; |
Line 770 macro_obsolete(MACRO_PROT_ARGS) |
|
Line 845 macro_obsolete(MACRO_PROT_ARGS) |
|
{ |
{ |
|
|
return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE)); |
return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE)); |
|
} |
|
|
|
|
|
int |
|
macro_end(struct mdoc *mdoc) |
|
{ |
|
|
|
assert(mdoc->first); |
|
assert(mdoc->last); |
|
return(rewind_last(mdoc, -1, mdoc->first)); |
} |
} |