version 1.107, 2011/04/19 16:38:48 |
version 1.119, 2012/11/17 00:26:33 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 74 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 74 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dt */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dt */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Os */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Os */ |
{ blk_full, 0 }, /* Sh */ |
{ blk_full, MDOC_PARSED }, /* Sh */ |
{ blk_full, 0 }, /* Ss */ |
{ blk_full, MDOC_PARSED }, /* Ss */ |
{ in_line_eoln, 0 }, /* Pp */ |
{ in_line_eoln, 0 }, /* Pp */ |
{ blk_part_imp, MDOC_PARSED }, /* D1 */ |
{ blk_part_imp, MDOC_PARSED }, /* D1 */ |
{ blk_part_imp, MDOC_PARSED }, /* Dl */ |
{ blk_part_imp, MDOC_PARSED }, /* Dl */ |
Line 203 const struct mdoc_macro * const mdoc_macros = __mdoc_m |
|
Line 203 const struct mdoc_macro * const mdoc_macros = __mdoc_m |
|
* are errors. |
* are errors. |
*/ |
*/ |
int |
int |
mdoc_macroend(struct mdoc *m) |
mdoc_macroend(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
/* Scan for open explicit scopes. */ |
/* Scan for open explicit scopes. */ |
|
|
n = MDOC_VALID & m->last->flags ? m->last->parent : m->last; |
n = MDOC_VALID & mdoc->last->flags ? |
|
mdoc->last->parent : mdoc->last; |
|
|
for ( ; n; n = n->parent) |
for ( ; n; n = n->parent) |
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags) |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags) |
mdoc_nmsg(m, n, MANDOCERR_SCOPEEXIT); |
mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT); |
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
|
|
return(rew_last(m, m->first)); |
return(rew_last(mdoc, mdoc->first)); |
} |
} |
|
|
|
|
Line 228 mdoc_macroend(struct mdoc *m) |
|
Line 229 mdoc_macroend(struct mdoc *m) |
|
static enum mdoct |
static enum mdoct |
lookup(enum mdoct from, const char *p) |
lookup(enum mdoct from, const char *p) |
{ |
{ |
/* FIXME: make -diag lists be un-PARSED. */ |
|
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
return(MDOC_MAX); |
return(MDOC_MAX); |
Line 264 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 264 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
while (mdoc->last != to) { |
while (mdoc->last != to) { |
/* |
/* |
* Save the parent here, because we may delete the |
* Save the parent here, because we may delete the |
* m->last node in the post-validation phase and reset |
* mdoc->last node in the post-validation phase and reset |
* it to m->last->parent, causing a step in the closing |
* it to mdoc->last->parent, causing a step in the closing |
* out to be lost. |
* out to be lost. |
*/ |
*/ |
np = mdoc->last->parent; |
np = mdoc->last->parent; |
Line 461 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
Line 461 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
*/ |
*/ |
static int |
static int |
make_pending(struct mdoc_node *broken, enum mdoct tok, |
make_pending(struct mdoc_node *broken, enum mdoct tok, |
struct mdoc *m, int line, int ppos) |
struct mdoc *mdoc, int line, int ppos) |
{ |
{ |
struct mdoc_node *breaker; |
struct mdoc_node *breaker; |
|
|
Line 516 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 516 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, m->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_SCOPENEST, 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 531 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 531 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
|
|
|
|
static int |
static int |
rew_sub(enum mdoc_type t, struct mdoc *m, |
rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
enum mdoct tok, int line, int ppos) |
enum mdoct tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
n = m->last; |
n = mdoc->last; |
while (n) { |
while (n) { |
switch (rew_dohalt(tok, t, n)) { |
switch (rew_dohalt(tok, t, n)) { |
case (REWIND_NONE): |
case (REWIND_NONE): |
Line 544 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 544 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
case (REWIND_THIS): |
case (REWIND_THIS): |
break; |
break; |
case (REWIND_FORCE): |
case (REWIND_FORCE): |
mandoc_vmsg(MANDOCERR_SCOPEBROKEN, m->parse, |
mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse, |
line, ppos, "%s breaks %s", |
line, ppos, "%s breaks %s", |
mdoc_macronames[tok], |
mdoc_macronames[tok], |
mdoc_macronames[n->tok]); |
mdoc_macronames[n->tok]); |
Line 553 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 553 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
n = n->parent; |
n = n->parent; |
continue; |
continue; |
case (REWIND_LATER): |
case (REWIND_LATER): |
if (make_pending(n, tok, m, line, ppos) || |
if (make_pending(n, tok, mdoc, line, ppos) || |
MDOC_BLOCK != t) |
MDOC_BLOCK != t) |
return(1); |
return(1); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (REWIND_ERROR): |
case (REWIND_ERROR): |
mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE); |
return(1); |
return(1); |
} |
} |
break; |
break; |
} |
} |
|
|
assert(n); |
assert(n); |
if ( ! rew_last(m, n)) |
if ( ! rew_last(mdoc, n)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 573 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 573 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
* Now that the current block ends, close the enclosing block, too. |
* Now that the current block ends, close the enclosing block, too. |
*/ |
*/ |
while (NULL != (n = n->pending)) { |
while (NULL != (n = n->pending)) { |
if ( ! rew_last(m, n)) |
if ( ! rew_last(mdoc, n)) |
return(0); |
return(0); |
if (MDOC_HEAD == n->type && |
if (MDOC_HEAD == n->type && |
! mdoc_body_alloc(m, n->line, n->pos, n->tok)) |
! mdoc_body_alloc(mdoc, n->line, n->pos, n->tok)) |
return(0); |
return(0); |
} |
} |
|
|
Line 588 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 588 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
* Punctuation consists of those tokens found in mdoc_isdelim(). |
* Punctuation consists of those tokens found in mdoc_isdelim(). |
*/ |
*/ |
static int |
static int |
dword(struct mdoc *m, int line, |
dword(struct mdoc *mdoc, int line, |
int col, const char *p, enum mdelim d) |
int col, const char *p, enum mdelim d) |
{ |
{ |
|
|
if (DELIM_MAX == d) |
if (DELIM_MAX == d) |
d = mdoc_isdelim(p); |
d = mdoc_isdelim(p); |
|
|
if ( ! mdoc_word_alloc(m, line, col, p)) |
if ( ! mdoc_word_alloc(mdoc, line, col, p)) |
return(0); |
return(0); |
|
|
if (DELIM_OPEN == d) |
if (DELIM_OPEN == d) |
m->last->flags |= MDOC_DELIMO; |
mdoc->last->flags |= MDOC_DELIMO; |
else if (DELIM_CLOSE == d) |
|
m->last->flags |= MDOC_DELIMC; |
|
|
|
|
/* |
|
* Closing delimiters only suppress the preceding space |
|
* when they follow something, not when they start a new |
|
* block or element, and not when they follow `No'. |
|
* |
|
* XXX Explicitly special-casing MDOC_No here feels |
|
* like a layering violation. Find a better way |
|
* and solve this in the code related to `No'! |
|
*/ |
|
|
|
else if (DELIM_CLOSE == d && mdoc->last->prev && |
|
mdoc->last->prev->tok != MDOC_No) |
|
mdoc->last->flags |= MDOC_DELIMC; |
|
|
return(1); |
return(1); |
} |
} |
|
|
static int |
static int |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
{ |
{ |
int la; |
int la; |
enum margserr ac; |
enum margserr ac; |
Line 618 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 630 append_delims(struct mdoc *m, int line, int *pos, char |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(m, line, pos, buf, &p); |
ac = mdoc_zargs(mdoc, line, pos, buf, &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; |
|
|
dword(m, line, la, p, DELIM_MAX); |
dword(mdoc, line, la, p, DELIM_MAX); |
|
|
/* |
/* |
* If we encounter end-of-sentence symbols, then trigger |
* If we encounter end-of-sentence symbols, then trigger |
* the double-space. |
* the double-space. |
* |
* |
* XXX: it's easy to allow this to propogate outward to |
* XXX: it's easy to allow this to propagate outward to |
* the last symbol, such that `. )' will cause the |
* the last symbol, such that `. )' will cause the |
* correct double-spacing. However, (1) groff isn't |
* correct double-spacing. However, (1) groff isn't |
* smart enough to do this and (2) it would require |
* smart enough to do this and (2) it would require |
* knowing which symbols break this behaviour, for |
* knowing which symbols break this behaviour, for |
* example, `. ;' shouldn't propogate the double-space. |
* example, `. ;' shouldn't propagate the double-space. |
*/ |
*/ |
if (mandoc_eos(p, strlen(p), 0)) |
if (mandoc_eos(p, strlen(p), 0)) |
m->last->flags |= MDOC_EOS; |
mdoc->last->flags |= MDOC_EOS; |
} |
} |
|
|
return(1); |
return(1); |
Line 661 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 673 blk_exp_close(MACRO_PROT_ARGS) |
|
enum mdoct atok, ntok; |
enum mdoct atok, ntok; |
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ec): |
case (MDOC_Ec): |
Line 678 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 690 blk_exp_close(MACRO_PROT_ARGS) |
|
*/ |
*/ |
atok = rew_alt(tok); |
atok = rew_alt(tok); |
body = later = NULL; |
body = later = NULL; |
for (n = m->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (MDOC_VALID & n->flags) |
if (MDOC_VALID & n->flags) |
continue; |
continue; |
|
|
Line 707 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 719 blk_exp_close(MACRO_PROT_ARGS) |
|
* postpone closing out the current block |
* postpone closing out the current block |
* until the rew_sub() closing out the sub-block. |
* until the rew_sub() closing out the sub-block. |
*/ |
*/ |
make_pending(later, tok, m, line, ppos); |
make_pending(later, tok, mdoc, line, ppos); |
|
|
/* |
/* |
* Mark the place where the formatting - but not |
* Mark the place where the formatting - but not |
* the scope - of the current block ends. |
* the scope - of the current block ends. |
*/ |
*/ |
if ( ! mdoc_endbody_alloc(m, line, ppos, |
if ( ! mdoc_endbody_alloc(mdoc, line, ppos, |
atok, body, ENDBODY_SPACE)) |
atok, body, ENDBODY_SPACE)) |
return(0); |
return(0); |
break; |
break; |
Line 727 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 739 blk_exp_close(MACRO_PROT_ARGS) |
|
if (later && |
if (later && |
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
continue; |
continue; |
if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) |
if (MDOC_It != n->tok) |
later = n; |
later = n; |
} |
} |
|
|
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]) |
mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST); |
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
return(rew_sub(MDOC_BLOCK, m, tok, line, ppos)); |
return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)); |
} |
} |
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if (NULL == later && maxargs > 0) |
if (NULL == later && maxargs > 0) |
if ( ! mdoc_tail_alloc(m, line, ppos, rew_alt(tok))) |
if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok))) |
return(0); |
return(0); |
|
|
for (flushed = j = 0; ; j++) { |
for (flushed = j = 0; ; j++) { |
lastarg = *pos; |
lastarg = *pos; |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
|
|
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 769 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 781 blk_exp_close(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, lastarg, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, lastarg, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! flushed) { |
if ( ! flushed) { |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
|
|
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! flushed && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if ( ! nl) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
Line 804 in_line(MACRO_PROT_ARGS) |
|
Line 816 in_line(MACRO_PROT_ARGS) |
|
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* |
/* |
* Whether we allow ignored elements (those without content, |
* Whether we allow ignored elements (those without content, |
Line 832 in_line(MACRO_PROT_ARGS) |
|
Line 844 in_line(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
Line 849 in_line(MACRO_PROT_ARGS) |
|
Line 861 in_line(MACRO_PROT_ARGS) |
|
|
|
for (cnt = scope = 0;; ) { |
for (cnt = scope = 0;; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 868 in_line(MACRO_PROT_ARGS) |
|
Line 880 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (MDOC_MAX != ntok) { |
if (MDOC_MAX != ntok) { |
if (scope && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(mdoc, 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(mdoc, line, |
|
ppos, tok, arg)) |
return(0); |
return(0); |
if ( ! rew_last(m, m->last)) |
if ( ! rew_last(mdoc, mdoc->last)) |
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
mdoc_pmsg(mdoc, line, ppos, |
|
MANDOCERR_MACROEMPTY); |
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
if ( ! nl) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
/* |
/* |
Line 906 in_line(MACRO_PROT_ARGS) |
|
Line 920 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
if (0 == cnt && (nc || MDOC_Li == tok) && |
if (0 == cnt && (nc || MDOC_Li == tok) && |
DELIM_CLOSE == d && ! scope) { |
DELIM_CLOSE == d && ! scope) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, |
|
ppos, tok, arg)) |
return(0); |
return(0); |
if (MDOC_Ar == tok || MDOC_Li == tok || |
if (MDOC_Ar == tok || MDOC_Li == tok || |
MDOC_Fl == tok) |
MDOC_Fl == tok) |
Line 917 in_line(MACRO_PROT_ARGS) |
|
Line 932 in_line(MACRO_PROT_ARGS) |
|
* Close out our scope, if one is open, before |
* Close out our scope, if one is open, before |
* any punctuation. |
* any punctuation. |
*/ |
*/ |
if (scope && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
scope = 0; |
scope = 0; |
} else if ( ! scope) { |
} else if ( ! scope) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
scope = 1; |
scope = 1; |
} |
} |
Line 929 in_line(MACRO_PROT_ARGS) |
|
Line 944 in_line(MACRO_PROT_ARGS) |
|
if (DELIM_NONE == d) |
if (DELIM_NONE == d) |
cnt++; |
cnt++; |
|
|
if ( ! dword(m, line, la, p, d)) |
if ( ! dword(mdoc, line, la, p, d)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 938 in_line(MACRO_PROT_ARGS) |
|
Line 953 in_line(MACRO_PROT_ARGS) |
|
* having to parse out spaces. |
* having to parse out spaces. |
*/ |
*/ |
if (scope && MDOC_Fl == tok) { |
if (scope && MDOC_Fl == tok) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
scope = 0; |
scope = 0; |
} |
} |
} |
} |
|
|
if (scope && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 954 in_line(MACRO_PROT_ARGS) |
|
Line 969 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
if ( ! rew_last(m, m->last)) |
if ( ! rew_last(mdoc, mdoc->last)) |
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY); |
} |
} |
|
|
if ( ! nl) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int la, nl; |
int la, nl, nparsed; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *body; /* save of body macro */ |
struct mdoc_node *body; /* save of body macro */ |
Line 983 blk_full(MACRO_PROT_ARGS) |
|
Line 998 blk_full(MACRO_PROT_ARGS) |
|
enum margverr av; |
enum margverr av; |
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
} |
} |
|
|
/* |
/* |
* This routine accomodates implicitly- and explicitly-scoped |
* This routine accommodates implicitly- and explicitly-scoped |
* macro openings. Implicit ones first close out prior scope |
* macro openings. Implicit ones first close out prior scope |
* (seen above). Delay opening the head until necessary to |
* (seen above). Delay opening the head until necessary to |
* allow leading punctuation to print. Special consideration |
* allow leading punctuation to print. Special consideration |
Line 1005 blk_full(MACRO_PROT_ARGS) |
|
Line 1020 blk_full(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
Line 1021 blk_full(MACRO_PROT_ARGS) |
|
Line 1036 blk_full(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
head = body = NULL; |
head = body = NULL; |
|
|
/* |
/* |
|
* Exception: Heads of `It' macros in `-diag' lists are not |
|
* parsed, even though `It' macros in general are parsed. |
|
*/ |
|
nparsed = MDOC_It == tok && |
|
MDOC_Bl == mdoc->last->parent->tok && |
|
LIST_diag == mdoc->last->parent->norm->Bl.type; |
|
|
|
/* |
* The `Nd' macro has all arguments in its body: it's a hybrid |
* The `Nd' macro has all arguments in its body: it's a hybrid |
* of block partial-explicit and full-implicit. Stupid. |
* of block partial-explicit and full-implicit. Stupid. |
*/ |
*/ |
|
|
if (MDOC_Nd == tok) { |
if (MDOC_Nd == tok) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = mdoc->last; |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
body = mdoc->last; |
} |
} |
|
|
ac = ARGS_ERROR; |
ac = ARGS_ERROR; |
Line 1048 blk_full(MACRO_PROT_ARGS) |
|
Line 1071 blk_full(MACRO_PROT_ARGS) |
|
la = *pos; |
la = *pos; |
/* Initialise last-phrase-type with ARGS_PEND. */ |
/* Initialise last-phrase-type with ARGS_PEND. */ |
lac = ARGS_ERROR == ac ? ARGS_PEND : ac; |
lac = ARGS_ERROR == ac ? ARGS_PEND : ac; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_PUNCT == ac) |
if (ARGS_PUNCT == ac) |
break; |
break; |
Line 1066 blk_full(MACRO_PROT_ARGS) |
|
Line 1089 blk_full(MACRO_PROT_ARGS) |
|
* reopen our scope if the last parse was a |
* reopen our scope if the last parse was a |
* phrase or partial phrase. |
* phrase or partial phrase. |
*/ |
*/ |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
body = mdoc->last; |
break; |
break; |
} |
} |
|
|
Line 1085 blk_full(MACRO_PROT_ARGS) |
|
Line 1108 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1093 blk_full(MACRO_PROT_ARGS) |
|
Line 1116 blk_full(MACRO_PROT_ARGS) |
|
/* Open a head if one hasn't been opened. */ |
/* Open a head if one hasn't been opened. */ |
|
|
if (NULL == head) { |
if (NULL == head) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = mdoc->last; |
} |
} |
|
|
if (ARGS_PHRASE == ac || |
if (ARGS_PHRASE == ac || |
Line 1107 blk_full(MACRO_PROT_ARGS) |
|
Line 1130 blk_full(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
mtt = body ? MDOC_BODY : MDOC_HEAD; |
mtt = body ? MDOC_BODY : MDOC_HEAD; |
if ( ! rew_sub(mtt, m, tok, line, ppos)) |
if ( ! rew_sub(mtt, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
/* Then allocate our body context. */ |
/* Then allocate our body context. */ |
|
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
body = mdoc->last; |
|
|
/* |
/* |
* Process phrases: set whether we're in a |
* Process phrases: set whether we're in a |
Line 1123 blk_full(MACRO_PROT_ARGS) |
|
Line 1146 blk_full(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (ARGS_PPHRASE == ac) |
if (ARGS_PPHRASE == ac) |
m->flags |= MDOC_PPHRASE; |
mdoc->flags |= MDOC_PPHRASE; |
if (ARGS_PEND == ac && ARGS_PPHRASE == lac) |
if (ARGS_PEND == ac && ARGS_PPHRASE == lac) |
m->flags |= MDOC_PPHRASE; |
mdoc->flags |= MDOC_PPHRASE; |
|
|
if ( ! phrase(m, line, la, buf)) |
if ( ! phrase(mdoc, line, la, buf)) |
return(0); |
return(0); |
|
|
m->flags &= ~MDOC_PPHRASE; |
mdoc->flags &= ~MDOC_PPHRASE; |
continue; |
continue; |
} |
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = nparsed || ARGS_QWORD == ac ? |
|
MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
|
|
if (NULL == head) { |
if (NULL == head) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = mdoc->last; |
} |
} |
|
|
if (nl && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(mdoc, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* If we've already opened our body, exit now. */ |
/* If we've already opened our body, exit now. */ |
Line 1167 blk_full(MACRO_PROT_ARGS) |
|
Line 1191 blk_full(MACRO_PROT_ARGS) |
|
* head to body until the rew_sub() call closing out that |
* head to body until the rew_sub() call closing out that |
* sub-block. |
* sub-block. |
*/ |
*/ |
for (n = m->last; n && n != head; n = n->parent) { |
for (n = mdoc->last; n && n != head; n = n->parent) { |
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
! (MDOC_VALID & n->flags)) { |
! (MDOC_VALID & n->flags)) { |
Line 1178 blk_full(MACRO_PROT_ARGS) |
|
Line 1202 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Close out scopes to remain in a consistent state. */ |
/* Close out scopes to remain in a consistent state. */ |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
|
|
out: |
out: |
if ( ! (MDOC_FREECOL & m->flags)) |
if ( ! (MDOC_FREECOL & mdoc->flags)) |
return(1); |
return(1); |
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
m->flags &= ~MDOC_FREECOL; |
mdoc->flags &= ~MDOC_FREECOL; |
return(1); |
return(1); |
} |
} |
|
|
Line 1208 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1232 blk_part_imp(MACRO_PROT_ARGS) |
|
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* |
/* |
* A macro that spans to the end of the line. This is generally |
* A macro that spans to the end of the line. This is generally |
Line 1219 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1243 blk_part_imp(MACRO_PROT_ARGS) |
|
* or more closing punctuation nodes. |
* or more closing punctuation nodes. |
*/ |
*/ |
|
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL)) |
if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) |
return(0); |
return(0); |
|
|
blk = m->last; |
blk = mdoc->last; |
|
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 1237 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1261 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
for (body = NULL; ; ) { |
for (body = NULL; ; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1248 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1272 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
if (NULL == body && ARGS_QWORD != ac && |
if (NULL == body && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if (NULL == body) { |
if (NULL == body) { |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
body = mdoc->last; |
} |
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
Line 1275 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1299 blk_part_imp(MACRO_PROT_ARGS) |
|
/* Clean-ups to leave in a consistent state. */ |
/* Clean-ups to leave in a consistent state. */ |
|
|
if (NULL == body) { |
if (NULL == body) { |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
body = mdoc->last; |
} |
} |
|
|
for (n = body->child; n && n->next; n = n->next) |
for (n = body->child; n && n->next; n = n->next) |
Line 1292 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1316 blk_part_imp(MACRO_PROT_ARGS) |
|
if (mandoc_eos(n->string, strlen(n->string), 1)) |
if (mandoc_eos(n->string, strlen(n->string), 1)) |
n->flags |= MDOC_EOS; |
n->flags |= MDOC_EOS; |
|
|
/* Up-propogate the end-of-space flag. */ |
/* Up-propagate the end-of-space flag. */ |
|
|
if (n && (MDOC_EOS & n->flags)) { |
if (n && (MDOC_EOS & n->flags)) { |
body->flags |= MDOC_EOS; |
body->flags |= MDOC_EOS; |
Line 1304 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1328 blk_part_imp(MACRO_PROT_ARGS) |
|
* postpone closing out the current block |
* postpone closing out the current block |
* until the rew_sub() call closing out the sub-block. |
* until the rew_sub() call closing out the sub-block. |
*/ |
*/ |
for (n = m->last; n && n != body && n != blk->parent; n = n->parent) { |
for (n = mdoc->last; n && n != body && n != blk->parent; |
|
n = n->parent) { |
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
! (MDOC_VALID & n->flags)) { |
! (MDOC_VALID & n->flags)) { |
make_pending(n, tok, m, line, ppos); |
make_pending(n, tok, mdoc, line, ppos); |
if ( ! mdoc_endbody_alloc(m, line, ppos, |
if ( ! mdoc_endbody_alloc(mdoc, line, ppos, |
tok, body, ENDBODY_NOSPACE)) |
tok, body, ENDBODY_NOSPACE)) |
return(0); |
return(0); |
return(1); |
return(1); |
Line 1323 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1348 blk_part_imp(MACRO_PROT_ARGS) |
|
* crufty use of `Op' breakage. |
* crufty use of `Op' breakage. |
*/ |
*/ |
if (n != body) |
if (n != body) |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, |
"%s broken", mdoc_macronames[tok]); |
"%s broken", mdoc_macronames[tok]); |
|
|
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (nl && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(mdoc, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |
|
|
if (n && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
|
/* Move trailing .Ns out of scope. */ |
|
|
|
for (n = body->child; n && n->next; n = n->next) |
|
/* Do nothing. */ ; |
|
if (n && MDOC_Ns == n->tok) |
|
mdoc_node_relink(mdoc, n); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1353 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1385 blk_part_exp(MACRO_PROT_ARGS) |
|
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* |
/* |
* The opening of an explicit macro having zero or more leading |
* The opening of an explicit macro having zero or more leading |
Line 1361 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1393 blk_part_exp(MACRO_PROT_ARGS) |
|
* case of `Eo'); and a body that may be empty. |
* case of `Eo'); and a body that may be empty. |
*/ |
*/ |
|
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL)) |
if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) |
return(0); |
return(0); |
|
|
for (head = body = NULL; ; ) { |
for (head = body = NULL; ; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1380 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1412 blk_part_exp(MACRO_PROT_ARGS) |
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if (NULL == head) { |
if (NULL == head) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = mdoc->last; |
} |
} |
|
|
/* |
/* |
Line 1401 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1433 blk_part_exp(MACRO_PROT_ARGS) |
|
assert(head); |
assert(head); |
/* No check whether it's a macro! */ |
/* No check whether it's a macro! */ |
if (MDOC_Eo == tok) |
if (MDOC_Eo == tok) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
body = mdoc->last; |
|
|
if (MDOC_Eo == tok) |
if (MDOC_Eo == tok) |
continue; |
continue; |
Line 1419 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1451 blk_part_exp(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
} |
} |
|
|
/* Clean-up to leave in a consistent state. */ |
/* Clean-up to leave in a consistent state. */ |
|
|
if (NULL == head) { |
if (NULL == head) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
|
} |
|
|
|
if (NULL == body) { |
if (NULL == body) { |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
return(0); |
return(0); |
body = m->last; |
|
} |
} |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if ( ! nl) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
Line 1464 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1493 in_line_argn(MACRO_PROT_ARGS) |
|
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* |
/* |
* A line macro that has a fixed number of arguments (maxargs). |
* A line macro that has a fixed number of arguments (maxargs). |
Line 1496 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1525 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
Line 1514 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1543 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (flushed = j = 0; ; ) { |
for (flushed = j = 0; ; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1526 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1555 in_line_argn(MACRO_PROT_ARGS) |
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && 0 == j && |
ARGS_QWORD != ac && 0 == j && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} else if (0 == j) |
} else if (0 == j) |
if ( ! mdoc_elem_alloc(m, line, la, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) |
return(0); |
return(0); |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
Line 1542 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1571 in_line_argn(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX != ntok) { |
if (MDOC_MAX != ntok) { |
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
j++; |
j++; |
break; |
break; |
Line 1555 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1584 in_line_argn(MACRO_PROT_ARGS) |
|
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
! flushed && |
! flushed && |
DELIM_NONE != mdoc_isdelim(p)) { |
DELIM_NONE != mdoc_isdelim(p)) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
|
|
/* |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
* XXX: this is a hack to work around groff's ugliness |
|
* as regards `Xr' and extraneous arguments. It should |
|
* ideally be deprecated behaviour, but because this is |
|
* code is no here, it's unlikely to be removed. |
|
*/ |
|
|
|
#ifdef __OpenBSD__ |
|
if (MDOC_Xr == tok && j == maxargs) { |
|
if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL)) |
|
return(0); |
|
if ( ! rew_elem(m, MDOC_Ns)) |
|
return(0); |
|
} |
|
#endif |
|
|
|
if ( ! dword(m, line, la, p, DELIM_MAX)) |
|
return(0); |
return(0); |
j++; |
j++; |
} |
} |
|
|
if (0 == j && ! mdoc_elem_alloc(m, line, la, tok, arg)) |
if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) |
return(0); |
return(0); |
|
|
/* Close out in a consistent state. */ |
/* Close out in a consistent state. */ |
|
|
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
if ( ! nl) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
Line 1607 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1620 in_line_eoln(MACRO_PROT_ARGS) |
|
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
|
|
if (tok == MDOC_Pp) |
if (tok == MDOC_Pp) |
rew_sub(MDOC_BLOCK, m, MDOC_Nm, line, ppos); |
rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); |
|
|
/* Parse macro arguments. */ |
/* Parse macro arguments. */ |
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
Line 1630 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1643 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
/* Open element scope. */ |
/* Open element scope. */ |
|
|
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
/* Parse argument terms. */ |
/* Parse argument terms. */ |
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1647 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1660 in_line_eoln(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
return(mdoc_macro(m, ntok, line, la, pos, buf)); |
return(mdoc_macro(mdoc, ntok, line, la, pos, buf)); |
} |
} |
|
|
/* Close out (no delimiters). */ |
/* Close out (no delimiters). */ |
|
|
return(rew_elem(m, tok)); |
return(rew_elem(mdoc, tok)); |
} |
} |
|
|
|
|
Line 1669 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1682 ctx_synopsis(MACRO_PROT_ARGS) |
|
{ |
{ |
int nl; |
int nl; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
if ( ! (MDOC_SYNOPSIS & m->flags)) |
if ( ! (MDOC_SYNOPSIS & mdoc->flags)) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(mdoc, tok, line, ppos, pos, buf)); |
|
|
/* If we're a nested call, same place. */ |
/* If we're a nested call, same place. */ |
if ( ! nl) |
if ( ! nl) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(mdoc, tok, line, ppos, pos, buf)); |
|
|
/* |
/* |
* XXX: this will open a block scope; however, if later we end |
* XXX: this will open a block scope; however, if later we end |
Line 1685 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1698 ctx_synopsis(MACRO_PROT_ARGS) |
|
* the formatting. Be careful. |
* the formatting. Be careful. |
*/ |
*/ |
if (MDOC_Nm == tok) |
if (MDOC_Nm == tok) |
return(blk_full(m, tok, line, ppos, pos, buf)); |
return(blk_full(mdoc, tok, line, ppos, pos, buf)); |
assert(MDOC_Vt == tok); |
assert(MDOC_Vt == tok); |
return(blk_part_imp(m, tok, line, ppos, pos, buf)); |
return(blk_part_imp(mdoc, tok, line, ppos, pos, buf)); |
} |
} |
|
|
|
|
|
|
obsolete(MACRO_PROT_ARGS) |
obsolete(MACRO_PROT_ARGS) |
{ |
{ |
|
|
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS); |
return(1); |
return(1); |
} |
} |
|
|
Line 1707 obsolete(MACRO_PROT_ARGS) |
|
Line 1720 obsolete(MACRO_PROT_ARGS) |
|
* macro is encountered. |
* macro is encountered. |
*/ |
*/ |
static int |
static int |
phrase(struct mdoc *m, int line, int ppos, char *buf) |
phrase(struct mdoc *mdoc, int line, int ppos, char *buf) |
{ |
{ |
int la, pos; |
int la, pos; |
enum margserr ac; |
enum margserr ac; |
Line 1717 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1730 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
ac = mdoc_zargs(m, line, &pos, buf, &p); |
ac = mdoc_zargs(mdoc, line, &pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1727 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1740 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, &pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, &pos, buf)) |
return(0); |
return(0); |
return(append_delims(m, line, &pos, buf)); |
return(append_delims(mdoc, line, &pos, buf)); |
} |
} |
|
|
return(1); |
return(1); |
Line 1755 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1768 phrase_ta(MACRO_PROT_ARGS) |
|
* it should simply error out with ARGSLOST. |
* it should simply error out with ARGSLOST. |
*/ |
*/ |
|
|
if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It)) |
return(0); |
return(0); |
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(m, line, pos, buf, &p); |
ac = mdoc_zargs(mdoc, line, pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1772 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1785 phrase_ta(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(mdoc, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
return(1); |
return(1); |