version 1.65, 2010/05/15 04:47:38 |
version 1.74, 2010/05/30 22:56:02 |
|
|
#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 170 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 171 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, 0 }, /* Hf */ |
{ in_line_eoln, 0 }, /* Hf */ |
{ obsolete, 0 }, /* Fr */ |
{ obsolete, 0 }, /* Fr */ |
{ in_line_eoln, 0 }, /* Ud */ |
{ in_line_eoln, 0 }, /* Ud */ |
{ in_line_eoln, 0 }, /* Lb */ |
{ in_line, 0 }, /* Lb */ |
{ in_line_eoln, 0 }, /* Lp */ |
{ in_line_eoln, 0 }, /* Lp */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ |
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 622 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 625 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
|
|
|
|
static int |
static int |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
{ |
{ |
int lastarg; |
int la; |
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(1); |
return(1); |
|
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
la = *pos; |
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
break; |
break; |
assert(mdoc_isdelim(p)); |
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
assert(DELIM_NONE != mdoc_isdelim(p)); |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
|
|
|
/* |
|
* If we encounter end-of-sentence symbols, then trigger |
|
* the double-space. |
|
* |
|
* XXX: it's easy to allow this to propogate outward to |
|
* the last symbol, such that `. )' will cause the |
|
* correct double-spacing. However, (1) groff isn't |
|
* smart enough to do this and (2) it would require |
|
* knowing which symbols break this behaviour, for |
|
* example, `. ;' shouldn't propogate the double-space. |
|
*/ |
|
if (mandoc_eos(p, strlen(p))) |
|
m->last->flags |= MDOC_EOS; |
} |
} |
|
|
return(1); |
return(1); |
Line 671 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 735 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, scope, 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 785 in_line(MACRO_PROT_ARGS) |
|
Line 805 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
for (cnt = 0, lastpunct = 1;; ) { |
for (cnt = scope = 0;; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
Line 806 in_line(MACRO_PROT_ARGS) |
|
Line 826 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (MDOC_MAX != ntok) { |
if (MDOC_MAX != ntok) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(m, tok)) |
return(0); |
return(0); |
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
Line 815 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 831 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 (DELIM_NONE != d) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
/* |
|
* If we encounter closing punctuation, no word |
|
* has been omitted, no scope is open, and we're |
|
* allowed to have an empty element, then start |
|
* a new scope. `Ar', `Fl', and `Li', only do |
|
* this once per invocation. There may be more |
|
* of these (all of them?). |
|
*/ |
|
if (0 == cnt && (nc || MDOC_Li == tok) && |
|
DELIM_CLOSE == d && ! scope) { |
|
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
|
return(0); |
|
if (MDOC_Ar == tok || MDOC_Li == tok || |
|
MDOC_Fl == tok) |
|
cnt++; |
|
scope = 1; |
|
} |
|
/* |
|
* Close out our scope, if one is open, before |
|
* any punctuation. |
|
*/ |
|
if (scope && ! rew_elem(m, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
scope = 0; |
} else if (lastpunct) { |
} else if ( ! scope) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
return(0); |
return(0); |
lastpunct = 0; |
scope = 1; |
} |
} |
|
|
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 853 in_line(MACRO_PROT_ARGS) |
|
Line 894 in_line(MACRO_PROT_ARGS) |
|
* word so that the `-' can be added to each one without |
* word so that the `-' can be added to each one without |
* having to parse out spaces. |
* having to parse out spaces. |
*/ |
*/ |
if (0 == lastpunct && MDOC_Fl == tok) { |
if (scope && MDOC_Fl == tok) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
scope = 0; |
} |
} |
} |
} |
|
|
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 876 in_line(MACRO_PROT_ARGS) |
|
Line 917 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 896 blk_full(MACRO_PROT_ARGS) |
|
Line 937 blk_full(MACRO_PROT_ARGS) |
|
#ifdef UGLY |
#ifdef UGLY |
struct mdoc_node *n; |
struct mdoc_node *n; |
#endif |
#endif |
|
enum mdoc_type mtt; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac, lac; |
enum margserr ac, lac; |
enum margverr av; |
enum margverr av; |
Line 964 blk_full(MACRO_PROT_ARGS) |
|
Line 1006 blk_full(MACRO_PROT_ARGS) |
|
|
|
for ( ; ; ) { |
for ( ; ; ) { |
la = *pos; |
la = *pos; |
lac = ac; |
/* Initialise last-phrase-type with ARGS_PHRASE. */ |
|
lac = ARGS_ERROR == ac ? ARGS_PHRASE : ac; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
Line 972 blk_full(MACRO_PROT_ARGS) |
|
Line 1015 blk_full(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (ARGS_PEND == ac) { |
/* |
if (ARGS_PPHRASE == lac) |
* Emit leading punctuation (i.e., punctuation before |
ac = ARGS_PPHRASE; |
* the MDOC_HEAD) for non-phrase types. |
else |
*/ |
ac = ARGS_PHRASE; |
|
} |
|
|
|
/* Don't emit leading punct. for phrases. */ |
|
|
|
if (NULL == head && |
if (NULL == head && |
|
ARGS_PEND != ac && |
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; |
} |
} |
|
|
/* Always re-open head for phrases. */ |
/* Open a head if one hasn't been opened. */ |
|
|
if (NULL == head || |
if (NULL == head) { |
ARGS_PHRASE == ac || |
|
ARGS_PPHRASE == ac) { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = m->last; |
} |
} |
|
|
if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) { |
if (ARGS_PHRASE == ac || |
|
ARGS_PEND == ac || |
|
ARGS_PPHRASE == ac) { |
|
/* |
|
* If we haven't opened a body yet, rewind the |
|
* head; if we have, rewind that instead. |
|
*/ |
|
|
|
mtt = body ? MDOC_BODY : MDOC_HEAD; |
|
if ( ! rew_sub(mtt, m, tok, line, ppos)) |
|
return(0); |
|
|
|
/* Then allocate our body context. */ |
|
|
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
body = m->last; |
|
|
|
/* |
|
* Process phrases: set whether we're in a |
|
* partial-phrase (this effects line handling) |
|
* then call down into the phrase parser. |
|
*/ |
|
|
if (ARGS_PPHRASE == ac) |
if (ARGS_PPHRASE == ac) |
m->flags |= MDOC_PPHRASE; |
m->flags |= MDOC_PPHRASE; |
if ( ! phrase(m, line, la, buf, ac)) |
if (ARGS_PEND == ac && ARGS_PPHRASE == lac) |
|
m->flags |= MDOC_PPHRASE; |
|
|
|
if (ARGS_PEND == ac) { |
|
if ( ! phrase(m, line, la, buf, lac)) |
|
return(0); |
|
} else if ( ! phrase(m, line, la, buf, ac)) |
return(0); |
return(0); |
|
|
m->flags &= ~MDOC_PPHRASE; |
m->flags &= ~MDOC_PPHRASE; |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
|
return(0); |
|
continue; |
continue; |
} |
} |
|
|
Line 1118 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1184 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 1182 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1248 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 1237 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1303 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 1382 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1448 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 1410 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1476 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)); |
} |
} |
|
|
|
|