version 1.66, 2010/05/15 06:48:13 |
version 1.68, 2010/05/17 22:11:42 |
|
|
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
|
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
Line 195 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
Line 196 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
int line, int pos, const struct mdoc_node *p) |
int line, int pos, const struct mdoc_node *p) |
{ |
{ |
const char *n, *t, *tt; |
const char *n, *t, *tt; |
|
int rc; |
|
|
n = t = "<root>"; |
n = t = "<root>"; |
tt = "block"; |
tt = "block"; |
Line 227 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
Line 229 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
break; |
break; |
} |
} |
|
|
if ( ! (MDOC_IGN_SCOPE & mdoc->pflags)) |
rc = mdoc_vmsg(mdoc, MANDOCERR_SCOPE, line, pos, |
return(mdoc_verr(mdoc, line, pos, |
"%s scope breaks %s of %s", tt, t, n); |
"%s scope breaks %s scope of %s", |
|
tt, t, n)); |
/* FIXME: logic should be in driver. */ |
return(mdoc_vwarn(mdoc, line, pos, |
return(MDOC_IGN_SCOPE & mdoc->pflags ? rc : 0); |
"%s scope breaks %s scope of %s", |
|
tt, t, n)); |
|
} |
} |
|
|
|
|
Line 256 mdoc_macroend(struct mdoc *m) |
|
Line 256 mdoc_macroend(struct mdoc *m) |
|
continue; |
continue; |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
continue; |
continue; |
return(mdoc_nerr(m, n, EOPEN)); |
mdoc_nmsg(m, n, MANDOCERR_SYNTSCOPE); |
|
return(0); |
} |
} |
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
Line 588 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 589 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(1); |
return(1); |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) |
return(1); |
return(1); |
return(mdoc_perr(m, line, ppos, ENOCTX)); |
/* FIXME: shouldn't raise an error */ |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
} |
} |
if (REWIND_REWIND == c) |
if (REWIND_REWIND == c) |
break; |
break; |
Line 640 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 643 append_delims(struct mdoc *m, int line, int *pos, char |
|
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(mdoc_isdelim(p)); |
assert(DELIM_NONE != mdoc_isdelim(p)); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
|
|
Line 686 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 689 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 */ |
if (buf[*pos]) |
if (buf[*pos]) |
if ( ! mdoc_pwarn(m, line, ppos, ENOLINE)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST)) |
return(0); |
return(0); |
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
Line 750 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 754 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, cnt, d, nc, nl; |
int la, lastpunct, cnt, nc, nl; |
enum margverr av; |
enum margverr av; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
|
enum mdelim d; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
Line 830 in_line(MACRO_PROT_ARGS) |
|
Line 835 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_pwarn(m, line, ppos, EIGNE)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
return(0); |
return(0); |
} |
} |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
Line 846 in_line(MACRO_PROT_ARGS) |
|
Line 851 in_line(MACRO_PROT_ARGS) |
|
* the word. |
* the word. |
*/ |
*/ |
|
|
d = ARGS_QWORD == ac ? 0 : mdoc_isdelim(p); |
d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); |
|
|
if (ARGS_QWORD != ac && d) { |
if (ARGS_QWORD != ac && DELIM_NONE != d) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (0 == lastpunct && ! rew_elem(m, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
lastpunct = 1; |
Line 858 in_line(MACRO_PROT_ARGS) |
|
Line 863 in_line(MACRO_PROT_ARGS) |
|
lastpunct = 0; |
lastpunct = 0; |
} |
} |
|
|
if ( ! d) |
if (DELIM_NONE == d) |
cnt++; |
cnt++; |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 891 in_line(MACRO_PROT_ARGS) |
|
Line 896 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_pwarn(m, line, ppos, EIGNE)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
return(0); |
return(0); |
} |
} |
|
|
Line 1000 blk_full(MACRO_PROT_ARGS) |
|
Line 1005 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PHRASE != ac && |
ARGS_PHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
1 == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_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 1133 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1138 blk_part_imp(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == body && ARGS_QWORD != ac && |
if (NULL == body && ARGS_QWORD != ac && |
1 == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_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 1197 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1202 blk_part_imp(MACRO_PROT_ARGS) |
|
if (body == n) |
if (body == n) |
break; |
break; |
|
|
if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) |
if (NULL == n && ! mdoc_nmsg(m, body, MANDOCERR_SCOPE)) |
return(0); |
return(0); |
|
|
if (n && ! rew_last(m, body)) |
if (n && ! rew_last(m, body)) |
Line 1252 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1257 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 && |
1 == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_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 1397 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1402 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 && 1 == mdoc_isdelim(p)) { |
0 == j && DELIM_OPEN == mdoc_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 1425 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1430 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 && mdoc_isdelim(p)) { |
! flushed && |
|
DELIM_NONE != mdoc_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_pwarn(m, line, ppos, EOBS)); |
return(mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS)); |
} |
} |
|
|
|
|