version 1.101, 2011/01/25 15:17:18 |
version 1.103, 2011/03/17 11:30:23 |
Line 599 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 599 append_delims(struct mdoc *m, int line, int *pos, char |
|
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(DELIM_NONE != mdoc_isdelim(p)); |
assert(DELIM_NONE != mandoc_isdelim(p)); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
|
|
Line 710 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 710 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 853 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 870 in_line(MACRO_PROT_ARGS) |
|
Line 869 in_line(MACRO_PROT_ARGS) |
|
* the word. |
* the word. |
*/ |
*/ |
|
|
d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); |
d = ARGS_QWORD == ac ? DELIM_NONE : mandoc_isdelim(p); |
|
|
if (DELIM_NONE != d) { |
if (DELIM_NONE != d) { |
/* |
/* |
Line 936 in_line(MACRO_PROT_ARGS) |
|
Line 935 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 1061 blk_full(MACRO_PROT_ARGS) |
|
Line 1059 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PHRASE != ac && |
ARGS_PHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mandoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1224 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1222 blk_part_imp(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == body && ARGS_QWORD != ac && |
if (NULL == body && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mandoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1299 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1297 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])) |
mdoc_vmsg(m, MANDOCERR_SCOPENEST, 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); |
Line 1355 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1353 blk_part_exp(MACRO_PROT_ARGS) |
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mandoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 1502 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1500 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
0 == j && DELIM_OPEN == mdoc_isdelim(p)) { |
0 == j && DELIM_OPEN == mandoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1531 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1529 in_line_argn(MACRO_PROT_ARGS) |
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
! flushed && |
! flushed && |
DELIM_NONE != mdoc_isdelim(p)) { |
DELIM_NONE != mandoc_isdelim(p)) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
|
|
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); |
} |
} |
|
|
|
|