version 1.44, 2009/01/20 12:51:28 |
version 1.48, 2009/01/20 20:56:21 |
Line 512 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 512 macro_scoped_close(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == c) |
Line 574 macro_scoped_close(MACRO_PROT_ARGS) |
|
Line 574 macro_scoped_close(MACRO_PROT_ARGS) |
|
int |
int |
macro_text(MACRO_PROT_ARGS) |
macro_text(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, c, fl, argc; |
int la, lastpunct, c, w, argc; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
char *p; |
char *p; |
|
|
Line 610 macro_text(MACRO_PROT_ARGS) |
|
Line 610 macro_text(MACRO_PROT_ARGS) |
|
|
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
fl = ARGS_DELIM; |
|
if (MDOC_QUOTABLE & mdoc_macros[tok].flags) |
|
fl |= ARGS_QUOTED; |
|
|
|
lastpunct = 0; |
lastpunct = 0; |
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
c = mdoc_args(mdoc, line, pos, buf, fl, &p); |
w = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ARGS_ERROR == c) { |
if (ARGS_ERROR == w) { |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
return(0); |
return(0); |
} |
} |
|
|
if (ARGS_EOLN == c) |
if (ARGS_EOLN == w) |
break; |
break; |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == w) |
break; |
break; |
|
|
if (-1 == (c = lookup(mdoc, line, la, tok, p))) |
c = ARGS_QWORD == w ? MDOC_MAX : |
return(0); |
lookup(mdoc, line, la, tok, p); |
else if (MDOC_MAX != c) { |
|
|
if (MDOC_MAX != c && -1 != c) { |
if (0 == lastpunct && ! 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); |
} |
} |
mdoc_argv_free(argc, argv); |
mdoc_argv_free(argc, argv); |
|
|
c = mdoc_macro(mdoc, c, line, la, pos, buf); |
c = mdoc_macro(mdoc, c, line, la, pos, buf); |
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
|
} else if (-1 == c) { |
|
mdoc_argv_free(argc, argv); |
|
return(0); |
} |
} |
|
|
if (mdoc_isdelim(p)) { |
if (ARGS_QWORD != w && mdoc_isdelim(p)) { |
if (0 == lastpunct && ! 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 704 macro_text(MACRO_PROT_ARGS) |
|
Line 703 macro_text(MACRO_PROT_ARGS) |
|
int |
int |
macro_scoped(MACRO_PROT_ARGS) |
macro_scoped(MACRO_PROT_ARGS) |
{ |
{ |
int c, lastarg, argc, fl; |
int c, lastarg, argc; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
char *p; |
char *p; |
|
|
assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
|
|
|
/* First rewind extant implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos)) |
if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
Line 717 macro_scoped(MACRO_PROT_ARGS) |
|
Line 718 macro_scoped(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
/* Parse arguments. */ |
|
|
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); |
Line 760 macro_scoped(MACRO_PROT_ARGS) |
|
Line 763 macro_scoped(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
fl = ARGS_DELIM; |
|
if (MDOC_TABSEP & mdoc_macros[tok].flags) |
|
fl |= ARGS_TABSEP; |
|
|
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_args(mdoc, line, pos, buf, fl, &p); |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
Line 774 macro_scoped(MACRO_PROT_ARGS) |
|
Line 773 macro_scoped(MACRO_PROT_ARGS) |
|
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == c) |
break; |
break; |
|
|
|
/* FIXME: if .It -column, the lookup must be for a |
|
* sub-line component. BLAH. */ |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
return(0); |
return(0); |
else if (MDOC_MAX == c) { |
|
|
if (MDOC_MAX == c) { |
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; |
Line 788 macro_scoped(MACRO_PROT_ARGS) |
|
Line 791 macro_scoped(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
break; |
break; |
} |
} |
|
|
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) |
if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if (1 == ppos && ! append_delims(mdoc, line, pos, buf)) |
if (1 == ppos && ! append_delims(mdoc, line, pos, buf)) |
Line 843 macro_scoped_line(MACRO_PROT_ARGS) |
|
Line 846 macro_scoped_line(MACRO_PROT_ARGS) |
|
lastarg = ppos; |
lastarg = ppos; |
for (;;) { |
for (;;) { |
lastarg = *pos; |
lastarg = *pos; |
c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
Line 939 macro_constant_scoped(MACRO_PROT_ARGS) |
|
Line 942 macro_constant_scoped(MACRO_PROT_ARGS) |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
|
|
c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == c) |
Line 1067 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 1070 macro_constant_delimited(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); |
c = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == c) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == c) |
Line 1113 macro_constant_delimited(MACRO_PROT_ARGS) |
|
Line 1116 macro_constant_delimited(MACRO_PROT_ARGS) |
|
int |
int |
macro_constant(MACRO_PROT_ARGS) |
macro_constant(MACRO_PROT_ARGS) |
{ |
{ |
int c, lastarg, argc, fl; |
int c, w, la, argc; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
struct mdoc_arg argv[MDOC_LINEARG_MAX]; |
char *p; |
char *p; |
|
|
assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); |
|
|
fl = 0; |
|
if (MDOC_QUOTABLE & mdoc_macros[tok].flags) |
|
fl = ARGS_QUOTED; |
|
|
|
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { |
lastarg = *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) |
if (ARGV_EOLN == c) |
break; |
break; |
if (ARGV_WORD == c) { |
if (ARGV_WORD == c) { |
*pos = lastarg; |
*pos = la; |
break; |
break; |
} else if (ARGV_ARG == c) |
} else if (ARGV_ARG == c) |
continue; |
continue; |
Line 1152 macro_constant(MACRO_PROT_ARGS) |
|
Line 1151 macro_constant(MACRO_PROT_ARGS) |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
la = *pos; |
c = mdoc_args(mdoc, line, pos, buf, fl, &p); |
w = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == w) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == w) |
break; |
break; |
|
|
if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) |
c = ARGS_QWORD == w ? MDOC_MAX : |
return(0); |
lookup(mdoc, line, la, tok, p); |
else if (MDOC_MAX != c) { |
|
|
if (MDOC_MAX != c && -1 != c) { |
if ( ! rewind_elem(mdoc, tok)) |
if ( ! rewind_elem(mdoc, tok)) |
return(0); |
return(0); |
return(mdoc_macro(mdoc, c, line, |
return(mdoc_macro(mdoc, c, line, la, pos, buf)); |
lastarg, pos, buf)); |
} else if (-1 == c) |
} |
return(0); |
|
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} |
} |
Line 1209 macro_end(struct mdoc *mdoc) |
|
Line 1209 macro_end(struct mdoc *mdoc) |
|
continue; |
continue; |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
continue; |
continue; |
mdoc_nerr(mdoc, n, "macro scope still open on exit"); |
return(mdoc_nerr(mdoc, n, "macro scope still open on exit")); |
return(0); |
|
} |
} |
|
|
return(rewind_last(mdoc, mdoc->first)); |
return(rewind_last(mdoc, mdoc->first)); |