version 1.37, 2009/01/15 17:38:57 |
version 1.39, 2009/01/16 14:04:26 |
Line 40 static int rewind_dobreak(int, enum mdoc_type, |
|
Line 40 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, int, int); |
static int rewind_expblock(struct mdoc *, int); |
static int rewind_expblock(struct mdoc *, int, int, int); |
static int rewind_subblock(enum mdoc_type, struct mdoc *, int); |
static int rewind_subblock(enum mdoc_type, struct mdoc *, int); |
static int rewind_last(int, int, |
static int rewind_last(int, int, |
struct mdoc *, struct mdoc_node *); |
struct mdoc *, struct mdoc_node *); |
Line 61 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
Line 61 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
if (MDOC_MAX == res) |
if (MDOC_MAX == res) |
return(res); |
return(res); |
|
|
if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX_MACLIKE)) |
if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter")) |
return(-1); |
return(-1); |
return(MDOC_MAX); |
return(MDOC_MAX); |
} |
} |
Line 364 rewind_subblock(enum mdoc_type type, struct mdoc *mdoc |
|
Line 364 rewind_subblock(enum mdoc_type type, struct mdoc *mdoc |
|
|
|
|
|
static int |
static int |
rewind_expblock(struct mdoc *mdoc, int tok) |
rewind_expblock(struct mdoc *mdoc, int tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
int c; |
|
|
c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); |
c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); |
if (REWIND_HALT == c) |
if (REWIND_HALT == c) |
return(mdoc_err(mdoc, ERR_SCOPE_NOCTX)); |
return(mdoc_perr(mdoc, line, ppos, "closing macro has no context")); |
if (REWIND_REWIND == c) |
if (REWIND_REWIND == c) |
return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); |
return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); |
|
|
Line 379 rewind_expblock(struct mdoc *mdoc, int tok) |
|
Line 379 rewind_expblock(struct mdoc *mdoc, int tok) |
|
for (n = mdoc->last->parent; 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_perr(mdoc, line, ppos, "closing macro has no context")); |
if (REWIND_REWIND == c) |
if (REWIND_REWIND == c) |
break; |
break; |
else if (rewind_dobreak(tok, MDOC_BLOCK, n)) |
else if (rewind_dobreak(tok, MDOC_BLOCK, n)) |
continue; |
continue; |
return(mdoc_nerr(mdoc, n, "macro scope broken")); |
return(mdoc_nerr(mdoc, n, "block scope broken")); |
} |
} |
|
|
assert(n); |
assert(n); |
Line 393 rewind_expblock(struct mdoc *mdoc, int tok) |
|
Line 393 rewind_expblock(struct mdoc *mdoc, int tok) |
|
|
|
|
|
static int |
static int |
rewind_impblock(struct mdoc *mdoc, int tok) |
rewind_impblock(struct mdoc *mdoc, int tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
int c; |
|
|
printf("1\n"); |
|
c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); |
c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); |
if (REWIND_HALT == c) |
if (REWIND_HALT == c) |
return(1); |
return(1); |
Line 414 rewind_impblock(struct mdoc *mdoc, int tok) |
|
Line 413 rewind_impblock(struct mdoc *mdoc, int tok) |
|
break; |
break; |
else if (rewind_dobreak(tok, MDOC_BLOCK, n)) |
else if (rewind_dobreak(tok, MDOC_BLOCK, n)) |
continue; |
continue; |
return(mdoc_nerr(mdoc, n, "macro scope broken")); |
return(mdoc_nerr(mdoc, n, "block scope broken")); |
} |
} |
|
|
assert(n); |
assert(n); |
Line 474 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 473 macro_scoped_close(MACRO_PROT_ARGS) |
|
if (0 == buf[*pos]) { |
if (0 == buf[*pos]) { |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
return(0); |
return(0); |
return(rewind_expblock(mdoc, tok)); |
return(rewind_expblock(mdoc, tok, line, ppos)); |
} |
} |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0)); |
return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters")); |
} |
} |
|
|
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
Line 495 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 494 macro_scoped_close(MACRO_PROT_ARGS) |
|
lastarg = *pos; |
lastarg = *pos; |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
if ( ! rewind_expblock(mdoc, tok)) |
if ( ! rewind_expblock(mdoc, tok, line, ppos)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
Line 512 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 511 macro_scoped_close(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
else if (MDOC_MAX != c) { |
else if (MDOC_MAX != c) { |
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rewind_expblock(mdoc, tok)) |
if ( ! rewind_expblock(mdoc, tok, line, ppos)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
Line 527 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 526 macro_scoped_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (MDOC_LINEARG_MAX == j) |
if (MDOC_LINEARG_MAX == j) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
|
|
if ( ! flushed && ! rewind_expblock(mdoc, tok)) |
if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if (ppos > 1) |
if (ppos > 1) |
Line 561 macro_text(MACRO_PROT_ARGS) |
|
Line 560 macro_text(MACRO_PROT_ARGS) |
|
la = *pos; |
la = *pos; |
|
|
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
if (ARGV_EOLN == c || ARGV_WORD == c) |
if (ARGV_EOLN == c) |
break; |
break; |
else if (ARGV_ARG == c) |
if (ARGV_WORD == c) { |
|
*pos = la; |
|
break; |
|
} else if (ARGV_ARG == c) |
continue; |
continue; |
|
|
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
} |
} |
|
|
if (MDOC_LINEARG_MAX == argc) { |
if (MDOC_LINEARG_MAX == argc) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
} |
} |
|
|
c = mdoc_elem_alloc(mdoc, line, la, tok, argc, argv); |
c = mdoc_elem_alloc(mdoc, line, la, tok, argc, argv); |
Line 643 macro_text(MACRO_PROT_ARGS) |
|
Line 646 macro_text(MACRO_PROT_ARGS) |
|
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
|
|
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, "too many arguments")); |
|
|
if (0 == lastpunct && ! rewind_elem(mdoc, tok)) |
if (0 == lastpunct && ! rewind_elem(mdoc, tok)) |
return(0); |
return(0); |
Line 668 macro_scoped(MACRO_PROT_ARGS) |
|
Line 671 macro_scoped(MACRO_PROT_ARGS) |
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) |
return(0); |
return(0); |
if ( ! rewind_impblock(mdoc, tok)) |
if ( ! rewind_impblock(mdoc, tok, line, ppos)) |
return(0); |
return(0); |
} |
} |
|
|
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
if (ARGV_EOLN == c || ARGV_WORD == c) |
if (ARGV_EOLN == c) |
break; |
break; |
else if (ARGV_ARG == c) |
if (ARGV_WORD == c) { |
|
*pos = lastarg; |
|
break; |
|
} else if (ARGV_ARG == c) |
continue; |
continue; |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
Line 685 macro_scoped(MACRO_PROT_ARGS) |
|
Line 691 macro_scoped(MACRO_PROT_ARGS) |
|
|
|
if (MDOC_LINEARG_MAX == argc) { |
if (MDOC_LINEARG_MAX == argc) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
} |
} |
|
|
c = mdoc_block_alloc(mdoc, line, ppos, |
c = mdoc_block_alloc(mdoc, line, ppos, |
Line 742 macro_scoped(MACRO_PROT_ARGS) |
|
Line 748 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, "too many arguments")); |
|
|
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
Line 804 macro_scoped_line(MACRO_PROT_ARGS) |
|
Line 810 macro_scoped_line(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, "too many arguments")); |
|
|
if (1 == ppos) { |
if (1 == ppos) { |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
Line 813 macro_scoped_line(MACRO_PROT_ARGS) |
|
Line 819 macro_scoped_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
} else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
return(0); |
return(0); |
return(rewind_impblock(mdoc, tok)); |
return(rewind_impblock(mdoc, tok, line, ppos)); |
} |
} |
|
|
|
|
Line 907 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 913 macro_constant_scoped(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (MDOC_LINEARG_MAX == j) |
if (MDOC_LINEARG_MAX == j) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
|
|
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) |
Line 944 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 950 macro_constant_delimited(MACRO_PROT_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ns): |
case (MDOC_Ns): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Pf): |
|
/* FALLTHROUGH */ |
case (MDOC_Ux): |
case (MDOC_Ux): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_St): |
case (MDOC_St): |
Line 957 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 965 macro_constant_delimited(MACRO_PROT_ARGS) |
|
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
if (ARGV_EOLN == c || ARGV_WORD == c) |
if (ARGV_EOLN == c) |
break; |
break; |
else if (ARGV_ARG == c) |
if (ARGV_WORD == c) { |
|
*pos = lastarg; |
|
break; |
|
} else if (ARGV_ARG == c) |
continue; |
continue; |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
Line 1013 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 1024 macro_constant_delimited(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (MDOC_LINEARG_MAX == j) |
if (MDOC_LINEARG_MAX == j) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
|
|
if ( ! flushed && rewind_elem(mdoc, tok)) |
if ( ! flushed && rewind_elem(mdoc, tok)) |
return(0); |
return(0); |
Line 1035 macro_constant(MACRO_PROT_ARGS) |
|
Line 1046 macro_constant(MACRO_PROT_ARGS) |
|
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
char *p; |
char *p; |
|
|
/* FIXME: parsing macros! */ |
|
|
|
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 1046 macro_constant(MACRO_PROT_ARGS) |
|
Line 1055 macro_constant(MACRO_PROT_ARGS) |
|
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == c) |
break; |
break; |
else if (ARGV_ARG == c) |
if (ARGV_WORD == c) { |
continue; |
*pos = lastarg; |
else if (ARGV_WORD == c) |
|
break; |
break; |
|
} else if (ARGV_ARG == c) |
|
continue; |
|
|
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
Line 1064 macro_constant(MACRO_PROT_ARGS) |
|
Line 1074 macro_constant(MACRO_PROT_ARGS) |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
if (MDOC_LINEARG_MAX == argc) |
if (MDOC_LINEARG_MAX == argc) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
|
|
for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { |
for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { |
lastarg = *pos; |
lastarg = *pos; |
Line 1074 macro_constant(MACRO_PROT_ARGS) |
|
Line 1084 macro_constant(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
|
return(0); |
|
else if (MDOC_MAX != c) { |
|
if ( ! rewind_elem(mdoc, tok)) |
|
return(0); |
|
return(mdoc_macro(mdoc, c, line, |
|
lastarg, pos, buf)); |
|
} |
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} |
} |
|
|
if (MDOC_LINEARG_MAX == sz + argc) |
if (MDOC_LINEARG_MAX == sz + argc) |
return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); |
return(mdoc_perr(mdoc, line, ppos, "too many arguments")); |
|
|
return(rewind_elem(mdoc, tok)); |
return(rewind_elem(mdoc, tok)); |
} |
} |
|
|
macro_obsolete(MACRO_PROT_ARGS) |
macro_obsolete(MACRO_PROT_ARGS) |
{ |
{ |
|
|
return(mdoc_pwarn(mdoc, line, ppos, WARN_IGN_OBSOLETE)); |
return(mdoc_pwarn(mdoc, line, ppos, WARN_SYNTAX, "macro is obsolete")); |
} |
} |
|
|
|
|