version 1.132, 2014/07/02 03:48:07 |
version 1.135, 2014/07/02 20:19:11 |
Line 528 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 528 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
taker->pending = broken->pending; |
taker->pending = broken->pending; |
} |
} |
broken->pending = breaker; |
broken->pending = breaker; |
mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_BLOCK_NEST, mdoc->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 919 in_line(MACRO_PROT_ARGS) |
|
Line 919 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); |
mdoc_pmsg(mdoc, line, ppos, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
MANDOCERR_MACROEMPTY); |
mdoc->parse, line, ppos, |
|
mdoc_macronames[tok]); |
} |
} |
|
|
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
Line 1005 in_line(MACRO_PROT_ARGS) |
|
Line 1006 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); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY); |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
} |
} |
|
|
if ( ! nl) |
if ( ! nl) |
Line 1354 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1356 blk_part_imp(MACRO_PROT_ARGS) |
|
return(1); |
return(1); |
} |
} |
} |
} |
|
assert(n == body); |
|
|
/* |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
* If we can't rewind to our body, then our scope has already |
|
* been closed by another macro (like `Oc' closing `Op'). This |
|
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
|
* crufty use of `Op' breakage. |
|
*/ |
|
if (n != body) |
|
mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, |
|
ppos, "%s broken", mdoc_macronames[tok]); |
|
|
|
if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
|
return(0); |
return(0); |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
Line 1375 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1368 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |
|
|
if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
/* Move trailing .Ns out of scope. */ |
/* Move trailing .Ns out of scope. */ |
Line 1573 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1566 in_line_argn(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
continue; |
continue; |
} else if (0 == j) |
} else if (0 == j) |
if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
Line 1609 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1602 in_line_argn(MACRO_PROT_ARGS) |
|
j++; |
j++; |
} |
} |
|
|
if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) |
if (0 == j && ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
/* Close out in a consistent state. */ |
/* Close out in a consistent state. */ |