version 1.83, 2010/06/29 19:20:38 |
version 1.104, 2011/03/20 16:02:05 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2010 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 |
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
enum rew { |
enum rew { /* see rew_dohalt() */ |
REWIND_REWIND, |
REWIND_NONE, |
REWIND_NOHALT, |
REWIND_THIS, |
REWIND_HALT |
REWIND_MORE, |
|
REWIND_FORCE, |
|
REWIND_LATER, |
|
REWIND_ERROR |
}; |
}; |
|
|
static int blk_full(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
Line 50 static int append_delims(struct mdoc *, |
|
Line 54 static int append_delims(struct mdoc *, |
|
int, int *, char *); |
int, int *, char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup_raw(const char *); |
static enum mdoct lookup_raw(const char *); |
static int make_pending(struct mdoc_node *, enum mdoc_type, |
static int make_pending(struct mdoc_node *, enum mdoct, |
struct mdoc *, int, int); |
struct mdoc *, int, int); |
static int phrase(struct mdoc *, int, int, char *); |
static int phrase(struct mdoc *, int, int, char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
static int rew_dobreak(enum mdoct, |
|
const struct mdoc_node *); |
|
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static int rew_elem(struct mdoc *, enum mdoct); |
static int rew_elem(struct mdoc *, enum mdoct); |
Line 97 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 99 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ |
{ blk_full, 0 }, /* Nd */ |
{ blk_full, 0 }, /* Nd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ |
{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */ |
{ obsolete, 0 }, /* Ot */ |
{ obsolete, 0 }, /* Ot */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ |
Line 137 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 139 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
Line 206 mdoc_macroend(struct mdoc *m) |
|
Line 208 mdoc_macroend(struct mdoc *m) |
|
|
|
n = MDOC_VALID & m->last->flags ? m->last->parent : m->last; |
n = MDOC_VALID & m->last->flags ? m->last->parent : m->last; |
|
|
for ( ; n; n = n->parent) { |
for ( ; n; n = n->parent) |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK == n->type && |
continue; |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
mdoc_nmsg(m, n, MANDOCERR_SCOPEEXIT); |
continue; |
|
mdoc_nmsg(m, n, MANDOCERR_SYNTSCOPE); |
|
return(0); |
|
} |
|
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
|
|
Line 254 lookup_raw(const char *p) |
|
Line 252 lookup_raw(const char *p) |
|
static int |
static int |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
{ |
{ |
|
struct mdoc_node *n, *np; |
|
|
assert(to); |
assert(to); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
/* LINTED */ |
/* LINTED */ |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
|
/* |
|
* Save the parent here, because we may delete the |
|
* m->last node in the post-validation phase and reset |
|
* it to m->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
np = mdoc->last->parent; |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
n = mdoc->last; |
return(0); |
mdoc->last = np; |
mdoc->last = mdoc->last->parent; |
|
assert(mdoc->last); |
assert(mdoc->last); |
|
mdoc->last->last = n; |
} |
} |
|
|
if ( ! mdoc_valid_post(mdoc)) |
return(mdoc_valid_post(mdoc)); |
return(0); |
|
return(mdoc_action_post(mdoc)); |
|
} |
} |
|
|
|
|
/* |
/* |
* Return the opening macro of a closing one, e.g., `Ec' has `Eo' as its |
* For a block closing macro, return the corresponding opening one. |
* matching pair. |
* Otherwise, return the macro itself. |
*/ |
*/ |
static enum mdoct |
static enum mdoct |
rew_alt(enum mdoct tok) |
rew_alt(enum mdoct tok) |
Line 315 rew_alt(enum mdoct tok) |
|
Line 319 rew_alt(enum mdoct tok) |
|
case (MDOC_Xc): |
case (MDOC_Xc): |
return(MDOC_Xo); |
return(MDOC_Xo); |
default: |
default: |
break; |
return(tok); |
} |
} |
abort(); |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
|
/* |
/* |
* Rewind rules. This indicates whether to stop rewinding |
* Rewinding to tok, how do we have to handle *p? |
* (REWIND_HALT) without touching our current scope, stop rewinding and |
* REWIND_NONE: *p would delimit tok, but no tok scope is open |
* close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT). |
* inside *p, so there is no need to rewind anything at all. |
* The scope-closing and so on occurs in the various rew_* routines. |
* REWIND_THIS: *p matches tok, so rewind *p and nothing else. |
|
* REWIND_MORE: *p is implicit, rewind it and keep searching for tok. |
|
* REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p. |
|
* REWIND_LATER: *p is explicit and still open, postpone rewinding. |
|
* REWIND_ERROR: No tok block is open at all. |
*/ |
*/ |
static enum rew |
static enum rew |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
const struct mdoc_node *p) |
const struct mdoc_node *p) |
{ |
{ |
|
|
|
/* |
|
* No matching token, no delimiting block, no broken block. |
|
* This can happen when full implicit macros are called for |
|
* the first time but try to rewind their previous |
|
* instance anyway. |
|
*/ |
if (MDOC_ROOT == p->type) |
if (MDOC_ROOT == p->type) |
return(REWIND_HALT); |
return(MDOC_BLOCK == type && |
if (MDOC_VALID & p->flags) |
MDOC_EXPLICIT & mdoc_macros[tok].flags ? |
return(REWIND_NOHALT); |
REWIND_ERROR : REWIND_NONE); |
|
|
|
/* |
|
* When starting to rewind, skip plain text |
|
* and nodes that have already been rewound. |
|
*/ |
|
if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) |
|
return(REWIND_MORE); |
|
|
|
/* |
|
* The easiest case: Found a matching token. |
|
* This applies to both blocks and elements. |
|
*/ |
|
tok = rew_alt(tok); |
|
if (tok == p->tok) |
|
return(p->end ? REWIND_NONE : |
|
type == p->type ? REWIND_THIS : REWIND_MORE); |
|
|
|
/* |
|
* While elements do require rewinding for themselves, |
|
* they never affect rewinding of other nodes. |
|
*/ |
|
if (MDOC_ELEM == p->type) |
|
return(REWIND_MORE); |
|
|
|
/* |
|
* Blocks delimited by our target token get REWIND_MORE. |
|
* Blocks delimiting our target token get REWIND_NONE. |
|
*/ |
switch (tok) { |
switch (tok) { |
case (MDOC_Aq): |
case (MDOC_Bl): |
/* FALLTHROUGH */ |
if (MDOC_It == p->tok) |
case (MDOC_Bq): |
return(REWIND_MORE); |
/* FALLTHROUGH */ |
|
case (MDOC_Brq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_D1): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Op): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ql): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Qq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sq): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Vt): |
|
assert(MDOC_TAIL != type); |
|
if (tok != p->tok) |
|
break; |
|
if (p->end) |
|
return(REWIND_HALT); |
|
if (type == p->type) |
|
return(REWIND_REWIND); |
|
break; |
break; |
case (MDOC_It): |
case (MDOC_It): |
assert(MDOC_TAIL != type); |
|
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
return(REWIND_HALT); |
return(REWIND_NONE); |
break; |
break; |
case (MDOC_Sh): |
/* |
if (type == p->type && tok == p->tok) |
* XXX Badly nested block handling still fails badly |
return(REWIND_REWIND); |
* when one block is breaking two blocks of the same type. |
|
* This is an incomplete and extremely ugly workaround, |
|
* required to let the OpenBSD tree build. |
|
*/ |
|
case (MDOC_Oo): |
|
if (MDOC_Op == p->tok) |
|
return(REWIND_MORE); |
break; |
break; |
|
case (MDOC_Nm): |
|
return(REWIND_NONE); |
case (MDOC_Nd): |
case (MDOC_Nd): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ss): |
case (MDOC_Ss): |
assert(MDOC_TAIL != type); |
|
if (type == p->type && tok == p->tok) |
|
return(REWIND_REWIND); |
|
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
return(REWIND_HALT); |
return(REWIND_NONE); |
break; |
|
case (MDOC_Ao): |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bd): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bf): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bk): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bro): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Do): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Eo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Oo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Po): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Qo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Rs): |
|
/* FALLTHROUGH */ |
|
case (MDOC_So): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Xo): |
|
if (tok != p->tok) |
|
break; |
|
if (p->end) |
|
return(REWIND_HALT); |
|
if (type == p->type) |
|
return(REWIND_REWIND); |
|
break; |
|
/* Multi-line explicit scope close. */ |
|
case (MDOC_Ac): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Brc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ec): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ed): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ek): |
|
/* FALLTHROUGH */ |
|
case (MDOC_El): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ef): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Oc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Qc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Re): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sc): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Xc): |
|
if (rew_alt(tok) != p->tok) |
|
break; |
|
if (p->end) |
|
return(REWIND_HALT); |
|
if (type == p->type) |
|
return(REWIND_REWIND); |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
return(REWIND_NOHALT); |
|
} |
|
|
|
|
|
/* |
|
* See if we can break an encountered scope (the rew_dohalt has returned |
|
* REWIND_NOHALT). |
|
*/ |
|
static int |
|
rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
|
{ |
|
|
|
assert(MDOC_ROOT != p->type); |
|
if (MDOC_ELEM == p->type) |
|
return(1); |
|
if (MDOC_TEXT == p->type) |
|
return(1); |
|
if (MDOC_VALID & p->flags) |
|
return(1); |
|
if (MDOC_BODY == p->type && p->end) |
|
return(1); |
|
|
|
switch (tok) { |
|
case (MDOC_It): |
|
return(MDOC_It == p->tok); |
|
case (MDOC_Nd): |
|
return(MDOC_Nd == p->tok); |
|
case (MDOC_Ss): |
|
return(MDOC_Ss == p->tok); |
|
case (MDOC_Sh): |
case (MDOC_Sh): |
if (MDOC_Nd == p->tok) |
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
return(1); |
MDOC_Sh == p->tok) |
if (MDOC_Ss == p->tok) |
return(REWIND_MORE); |
return(1); |
|
return(MDOC_Sh == p->tok); |
|
case (MDOC_El): |
|
if (MDOC_It == p->tok) |
|
return(1); |
|
break; |
break; |
case (MDOC_Oc): |
|
if (MDOC_Op == p->tok) |
|
return(1); |
|
break; |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
if (MDOC_EXPLICIT & mdoc_macros[tok].flags) |
/* |
return(p->tok == rew_alt(tok)); |
* Default block rewinding rules. |
else if (MDOC_BLOCK == p->type) |
* In particular, always skip block end markers, |
return(1); |
* and let all blocks rewind Nm children. |
|
*/ |
|
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
|
(MDOC_BLOCK == p->type && |
|
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
|
return(REWIND_MORE); |
|
|
return(tok == p->tok); |
/* |
|
* By default, closing out full blocks |
|
* forces closing of broken explicit blocks, |
|
* while closing out partial blocks |
|
* allows delayed rewinding by default. |
|
*/ |
|
return (&blk_full == mdoc_macros[tok].fp ? |
|
REWIND_FORCE : REWIND_LATER); |
} |
} |
|
|
|
|
Line 574 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 481 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
continue; |
continue; |
} |
} |
|
|
if (REWIND_REWIND != rew_dohalt(tok, MDOC_BLOCK, breaker)) |
if (REWIND_THIS != rew_dohalt(tok, MDOC_BLOCK, breaker)) |
continue; |
continue; |
if (MDOC_BODY == broken->type) |
if (MDOC_BODY == broken->type) |
broken = broken->parent; |
broken = broken->parent; |
Line 606 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 513 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
taker->pending = broken->pending; |
taker->pending = broken->pending; |
} |
} |
broken->pending = breaker; |
broken->pending = breaker; |
mdoc_vmsg(m, MANDOCERR_SCOPE, line, ppos, "%s breaks %s", |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, |
mdoc_macronames[tok], mdoc_macronames[broken->tok]); |
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[broken->tok]); |
return(1); |
return(1); |
} |
} |
|
|
/* |
/* |
* Found no matching block for tok. |
* Found no matching block for tok. |
* Are you trying to close a block that is not open? |
* Are you trying to close a block that is not open? |
* Report failure and abort the parser. |
|
*/ |
*/ |
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
return(0); |
} |
} |
|
|
|
|
static int |
static int |
rew_sub(enum mdoc_type t, struct mdoc *m, |
rew_sub(enum mdoc_type t, struct mdoc *m, |
enum mdoct tok, int line, int ppos) |
enum mdoct tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
enum rew c; |
|
|
|
/* LINTED */ |
n = m->last; |
for (n = m->last; n; n = n->parent) { |
while (n) { |
c = rew_dohalt(tok, t, n); |
switch (rew_dohalt(tok, t, n)) { |
if (REWIND_HALT == c) { |
case (REWIND_NONE): |
if (n->end || MDOC_BLOCK != t) |
return(1); |
return(1); |
case (REWIND_THIS): |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) |
|
return(1); |
|
/* FIXME: shouldn't raise an error */ |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
|
} |
|
if (REWIND_REWIND == c) |
|
break; |
break; |
else if (rew_dobreak(tok, n)) |
case (REWIND_FORCE): |
|
mandoc_vmsg(MANDOCERR_SCOPEBROKEN, m->parse, |
|
line, ppos, "%s breaks %s", |
|
mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
|
/* FALLTHROUGH */ |
|
case (REWIND_MORE): |
|
n = n->parent; |
continue; |
continue; |
return(make_pending(n, tok, m, line, ppos)); |
case (REWIND_LATER): |
|
if (make_pending(n, tok, m, line, ppos) || |
|
MDOC_BLOCK != t) |
|
return(1); |
|
/* FALLTHROUGH */ |
|
case (REWIND_ERROR): |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
|
return(1); |
|
} |
|
break; |
} |
} |
|
|
assert(n); |
assert(n); |
Line 685 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 600 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 700 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 615 append_delims(struct mdoc *m, int line, int *pos, char |
|
* knowing which symbols break this behaviour, for |
* knowing which symbols break this behaviour, for |
* example, `. ;' shouldn't propogate the double-space. |
* example, `. ;' shouldn't propogate the double-space. |
*/ |
*/ |
if (mandoc_eos(p, strlen(p))) |
if (mandoc_eos(p, strlen(p), 0)) |
m->last->flags |= MDOC_EOS; |
m->last->flags |= MDOC_EOS; |
} |
} |
|
|
Line 746 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 661 blk_exp_close(MACRO_PROT_ARGS) |
|
|
|
/* Remember the start of our own body. */ |
/* Remember the start of our own body. */ |
if (MDOC_BODY == n->type && atok == n->tok) { |
if (MDOC_BODY == n->type && atok == n->tok) { |
if ( ! n->end) |
if (ENDBODY_NOT == n->end) |
body = n; |
body = n; |
continue; |
continue; |
} |
} |
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type || MDOC_Nm == n->tok) |
continue; |
continue; |
if (atok == n->tok) { |
if (atok == n->tok) { |
assert(body); |
assert(body); |
Line 769 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 684 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. |
*/ |
*/ |
if ( ! make_pending(later, tok, m, line, ppos)) |
make_pending(later, tok, m, line, ppos); |
return(0); |
|
|
|
/* |
/* |
* Mark the place where the formatting - but not |
* Mark the place where the formatting - but not |
Line 790 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 704 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_CALLABLE & mdoc_macros[n->tok].flags) |
assert( ! (MDOC_ACTED & n->flags)); |
|
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]) |
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 884 in_line(MACRO_PROT_ARGS) |
|
Line 795 in_line(MACRO_PROT_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Fl): |
case (MDOC_Fl): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Lk): |
case (MDOC_Mt): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Nm): |
case (MDOC_Nm): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 943 in_line(MACRO_PROT_ARGS) |
|
Line 854 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 959 in_line(MACRO_PROT_ARGS) |
|
Line 870 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 1025 in_line(MACRO_PROT_ARGS) |
|
Line 936 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 1116 blk_full(MACRO_PROT_ARGS) |
|
Line 1026 blk_full(MACRO_PROT_ARGS) |
|
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(m, line, pos, buf, tok, &p); |
|
|
|
if (ARGS_PUNCT == ac) |
|
break; |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
|
|
Line 1147 blk_full(MACRO_PROT_ARGS) |
|
Line 1060 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 1234 blk_full(MACRO_PROT_ARGS) |
|
Line 1147 blk_full(MACRO_PROT_ARGS) |
|
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)) { |
assert( ! (MDOC_ACTED & n->flags)); |
|
n->pending = head; |
n->pending = head; |
return(1); |
return(1); |
} |
} |
Line 1311 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1223 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 1353 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1265 blk_part_imp(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (n && MDOC_TEXT == n->type && n->string) |
if (n && MDOC_TEXT == n->type && n->string) |
if (mandoc_eos(n->string, strlen(n->string))) |
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-propogate the end-of-space flag. */ |
Line 1372 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1284 blk_part_imp(MACRO_PROT_ARGS) |
|
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)) { |
assert( ! (MDOC_ACTED & n->flags)); |
make_pending(n, tok, m, line, ppos); |
if ( ! make_pending(n, tok, m, line, ppos)) |
|
return(0); |
|
if ( ! mdoc_endbody_alloc(m, line, ppos, |
if ( ! mdoc_endbody_alloc(m, line, ppos, |
tok, body, ENDBODY_NOSPACE)) |
tok, body, ENDBODY_NOSPACE)) |
return(0); |
return(0); |
Line 1388 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1298 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_SCOPE, line, ppos, |
if (n != body) |
"%s broken", mdoc_macronames[tok])) |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, 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 1444 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1354 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 1550 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1460 in_line_argn(MACRO_PROT_ARGS) |
|
case (MDOC_Ux): |
case (MDOC_Ux): |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
|
case (MDOC_Bx): |
|
/* FALLTHROUGH */ |
case (MDOC_Xr): |
case (MDOC_Xr): |
maxargs = 2; |
maxargs = 2; |
break; |
break; |
Line 1589 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1501 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 1618 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1530 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; |
Line 1670 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1582 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
|
|
|
if (tok == MDOC_Pp) |
|
rew_sub(MDOC_BLOCK, m, MDOC_Nm, line, ppos); |
|
|
/* Parse macro arguments. */ |
/* Parse macro arguments. */ |
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
Line 1733 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1648 ctx_synopsis(MACRO_PROT_ARGS) |
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & m->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 (SEC_SYNOPSIS != m->lastsec) |
if ( ! (MDOC_SYNOPSIS & m->flags)) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* If we're a nested call, same place. */ |
/* If we're a nested call, same place. */ |
Line 1745 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1660 ctx_synopsis(MACRO_PROT_ARGS) |
|
* up formatting the block scope, then child nodes will inherit |
* up formatting the block scope, then child nodes will inherit |
* the formatting. Be careful. |
* the formatting. Be careful. |
*/ |
*/ |
|
if (MDOC_Nm == tok) |
|
return(blk_full(m, tok, line, ppos, pos, buf)); |
|
assert(MDOC_Vt == tok); |
return(blk_part_imp(m, tok, line, ppos, pos, buf)); |
return(blk_part_imp(m, tok, line, ppos, pos, buf)); |
} |
} |
|
|
|
|
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); |
} |
} |
|
|
|
|