version 1.102, 2011/03/17 09:16:38 |
version 1.104, 2011/03/20 16:02:05 |
Line 513 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 513 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 541 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 541 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 710 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 711 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 854 in_line(MACRO_PROT_ARGS) |
|
Line 854 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 936 in_line(MACRO_PROT_ARGS) |
|
Line 936 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 1299 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1298 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); |
|
|
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); |
} |
} |
|
|
|
|