version 1.1, 2009/03/23 14:22:11 |
version 1.4, 2009/03/27 14:56:15 |
|
|
/* FIXME: .Fl, .Ar, .Cd handling of `|'. */ |
/* FIXME: .Fl, .Ar, .Cd handling of `|'. */ |
|
|
enum mwarn { |
enum mwarn { |
|
WIGNE, |
WIMPBRK, |
WIMPBRK, |
WMACPARM, |
WMACPARM, |
WOBS |
WOBS |
Line 237 pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn |
|
Line 238 pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn |
|
|
|
p = NULL; |
p = NULL; |
switch (type) { |
switch (type) { |
|
case (WIGNE): |
|
p = "ignoring empty element"; |
|
break; |
case (WIMPBRK): |
case (WIMPBRK): |
p = "crufty end-of-line scope violation"; |
p = "crufty end-of-line scope violation"; |
break; |
break; |
Line 305 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
Line 309 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
* are errors. |
* are errors. |
*/ |
*/ |
int |
int |
macro_end(struct mdoc *mdoc) |
mdoc_macroend(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert(mdoc->first); |
|
assert(mdoc->last); |
|
|
|
/* Scan for open explicit scopes. */ |
/* Scan for open explicit scopes. */ |
|
|
n = MDOC_VALID & mdoc->last->flags ? |
n = MDOC_VALID & mdoc->last->flags ? |
Line 803 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 804 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, c, w; |
int la, lastpunct, c, w, cnt, d, nc; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
|
/* |
|
* Whether we allow ignored elements (those without content, |
|
* usually because of reserved words) to squeak by. |
|
*/ |
|
switch (tok) { |
|
case (MDOC_Lp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Nm): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ar): |
|
nc = 1; |
|
break; |
|
default: |
|
nc = 0; |
|
break; |
|
} |
|
|
for (la = ppos, arg = NULL;; ) { |
for (la = ppos, arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
Line 815 in_line(MACRO_PROT_ARGS) |
|
Line 837 in_line(MACRO_PROT_ARGS) |
|
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == c) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == c) |
Line 825 in_line(MACRO_PROT_ARGS) |
|
Line 846 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
for (cnt = 0, lastpunct = 1;; ) { |
return(0); |
|
mdoc->next = MDOC_NEXT_CHILD; |
|
|
|
for (lastpunct = 0;; ) { |
|
la = *pos; |
la = *pos; |
w = mdoc_args(mdoc, line, pos, buf, tok, &p); |
w = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
Line 845 in_line(MACRO_PROT_ARGS) |
|
Line 862 in_line(MACRO_PROT_ARGS) |
|
c = ARGS_QWORD == w ? MDOC_MAX : |
c = ARGS_QWORD == w ? MDOC_MAX : |
lookup(mdoc, line, la, tok, p); |
lookup(mdoc, line, la, tok, p); |
|
|
/* MDOC_MAX (not a macro) or -1 (error). */ |
/* |
|
* In this case, we've located a submacro and must |
|
* execute it. Close out scope, if open. If no |
|
* elements have been generated, either create one (nc) |
|
* or raise a warning. |
|
*/ |
|
|
if (MDOC_MAX != c && -1 != c) { |
if (MDOC_MAX != c && -1 != c) { |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
|
if (nc && 0 == cnt) { |
|
if ( ! mdoc_elem_alloc(mdoc, line, ppos, |
|
tok, arg)) |
|
return(0); |
|
mdoc->next = MDOC_NEXT_SIBLING; |
|
} else if ( ! nc && 0 == cnt) |
|
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
|
return(0); |
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); |
Line 859 in_line(MACRO_PROT_ARGS) |
|
Line 889 in_line(MACRO_PROT_ARGS) |
|
} else if (-1 == c) |
} else if (-1 == c) |
return(0); |
return(0); |
|
|
/* Non-quote-enclosed punctuation. */ |
/* |
|
* Non-quote-enclosed punctuation. Set up our scope, if |
|
* a word; rewind the scope, if a delimiter; then append |
|
* the word. |
|
*/ |
|
|
if (ARGS_QWORD != w && mdoc_isdelim(p)) { |
d = mdoc_isdelim(p); |
|
|
|
if (ARGS_QWORD != w && d) { |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
lastpunct = 1; |
} else if (lastpunct) { |
} else if (lastpunct) { |
c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
|
|
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
|
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
lastpunct = 0; |
lastpunct = 0; |
} |
} |
|
|
|
if ( ! d) |
|
cnt++; |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
if ( ! mdoc_word_alloc(mdoc, line, la, p)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
Line 882 in_line(MACRO_PROT_ARGS) |
|
Line 918 in_line(MACRO_PROT_ARGS) |
|
|
|
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
if (0 == lastpunct && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
|
|
|
/* |
|
* If no elements have been collected and we're allowed to have |
|
* empties (nc), open a scope and close it out. Otherwise, |
|
* raise a warning. |
|
* |
|
*/ |
|
if (nc && 0 == cnt) { |
|
c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
|
if (0 == c) |
|
return(0); |
|
mdoc->next = MDOC_NEXT_SIBLING; |
|
} else if ( ! nc && 0 == cnt) |
|
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
|
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)); |