version 1.129, 2014/01/21 10:26:53 |
version 1.147, 2014/11/26 19:22:51 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012, 2013, 2014 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 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
|
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <stdlib.h> |
#include <stdlib.h> |
Line 40 enum rew { /* see rew_dohalt() */ |
|
Line 40 enum rew { /* see rew_dohalt() */ |
|
REWIND_ERROR |
REWIND_ERROR |
}; |
}; |
|
|
static int blk_full(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
static int blk_exp_close(MACRO_PROT_ARGS); |
static int blk_exp_close(MACRO_PROT_ARGS); |
static int blk_part_exp(MACRO_PROT_ARGS); |
static int blk_part_exp(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
static int ctx_synopsis(MACRO_PROT_ARGS); |
static int ctx_synopsis(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int in_line_argn(MACRO_PROT_ARGS); |
static int in_line_argn(MACRO_PROT_ARGS); |
static int in_line(MACRO_PROT_ARGS); |
static int in_line(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
static int phrase_ta(MACRO_PROT_ARGS); |
static int phrase_ta(MACRO_PROT_ARGS); |
|
|
|
static int dword(struct mdoc *, int, int, const char *, |
static int dword(struct mdoc *, int, int, const char *, |
enum mdelim, int); |
enum mdelim, int); |
static int append_delims(struct mdoc *, |
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 mdoct, |
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 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); |
static int rew_last(struct mdoc *, |
static int rew_last(struct mdoc *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static int rew_sub(enum mdoc_type, struct mdoc *, |
static int rew_sub(enum mdoc_type, struct mdoc *, |
enum mdoct, int, int); |
enum mdoct, int, int); |
|
|
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
Line 104 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 103 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_full, MDOC_JOIN }, /* Nd */ |
{ blk_full, MDOC_JOIN }, /* Nd */ |
{ ctx_synopsis, 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 */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ot */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ |
{ in_line_eoln, 0 }, /* Rv */ |
{ in_line_eoln, 0 }, /* Rv */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */ |
Line 148 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 147 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, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | |
MDOC_IGNDELIM | MDOC_JOIN }, /* No */ |
|
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | |
|
MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */ |
MDOC_IGNDELIM | MDOC_JOIN }, /* 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 */ |
Line 173 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 171 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | |
MDOC_EXPLICIT | MDOC_JOIN }, /* So */ |
MDOC_EXPLICIT | MDOC_JOIN }, /* So */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */ |
{ in_line_eoln, 0 }, /* Sm */ |
{ in_line_argn, 0 }, /* Sm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ |
Line 191 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 189 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */ |
{ in_line_eoln, 0 }, /* Bt */ |
{ in_line_eoln, 0 }, /* Bt */ |
{ in_line_eoln, 0 }, /* Hf */ |
{ in_line_eoln, 0 }, /* Hf */ |
{ obsolete, 0 }, /* Fr */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fr */ |
{ in_line_eoln, 0 }, /* Ud */ |
{ in_line_eoln, 0 }, /* Ud */ |
{ in_line, 0 }, /* Lb */ |
{ in_line, 0 }, /* Lb */ |
{ in_line_eoln, 0 }, /* Lp */ |
{ in_line_eoln, 0 }, /* Lp */ |
Line 203 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 201 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED | |
{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED | |
MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */ |
MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */ |
{ in_line_eoln, MDOC_JOIN }, /* %C */ |
{ in_line_eoln, MDOC_JOIN }, /* %C */ |
{ obsolete, 0 }, /* Es */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Es */ |
{ obsolete, 0 }, /* En */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ |
{ in_line_eoln, MDOC_JOIN }, /* %Q */ |
{ in_line_eoln, MDOC_JOIN }, /* %Q */ |
{ in_line_eoln, 0 }, /* br */ |
{ in_line_eoln, 0 }, /* br */ |
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* %U */ |
{ in_line_eoln, 0 }, /* %U */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
|
{ in_line_eoln, MDOC_PROLOGUE }, /* ll */ |
}; |
}; |
|
|
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
Line 229 mdoc_macroend(struct mdoc *mdoc) |
|
Line 228 mdoc_macroend(struct mdoc *mdoc) |
|
/* Scan for open explicit scopes. */ |
/* Scan for open explicit scopes. */ |
|
|
n = MDOC_VALID & mdoc->last->flags ? |
n = MDOC_VALID & mdoc->last->flags ? |
mdoc->last->parent : mdoc->last; |
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(mdoc, n, MANDOCERR_SCOPEEXIT); |
mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
|
|
return(rew_last(mdoc, mdoc->first)); |
return(rew_last(mdoc, mdoc->first)); |
} |
} |
|
|
|
|
/* |
/* |
* Look up a macro from within a subsequent context. |
* Look up a macro from within a subsequent context. |
*/ |
*/ |
Line 254 lookup(enum mdoct from, const char *p) |
|
Line 253 lookup(enum mdoct from, const char *p) |
|
return(lookup_raw(p)); |
return(lookup_raw(p)); |
} |
} |
|
|
|
|
/* |
/* |
* Lookup a macro following the initial line macro. |
* Lookup a macro following the initial line macro. |
*/ |
*/ |
Line 270 lookup_raw(const char *p) |
|
Line 268 lookup_raw(const char *p) |
|
return(MDOC_MAX); |
return(MDOC_MAX); |
} |
} |
|
|
|
|
static int |
static int |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
{ |
{ |
Line 279 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 276 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
assert(to); |
assert(to); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
/* LINTED */ |
|
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 |
Line 299 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 296 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
return(mdoc_valid_post(mdoc)); |
return(mdoc_valid_post(mdoc)); |
} |
} |
|
|
|
|
/* |
/* |
* For a block closing macro, return the corresponding opening one. |
* For a block closing macro, return the corresponding opening one. |
* Otherwise, return the macro itself. |
* Otherwise, return the macro itself. |
Line 308 static enum mdoct |
|
Line 304 static enum mdoct |
|
rew_alt(enum mdoct tok) |
rew_alt(enum mdoct tok) |
{ |
{ |
switch (tok) { |
switch (tok) { |
case (MDOC_Ac): |
case MDOC_Ac: |
return(MDOC_Ao); |
return(MDOC_Ao); |
case (MDOC_Bc): |
case MDOC_Bc: |
return(MDOC_Bo); |
return(MDOC_Bo); |
case (MDOC_Brc): |
case MDOC_Brc: |
return(MDOC_Bro); |
return(MDOC_Bro); |
case (MDOC_Dc): |
case MDOC_Dc: |
return(MDOC_Do); |
return(MDOC_Do); |
case (MDOC_Ec): |
case MDOC_Ec: |
return(MDOC_Eo); |
return(MDOC_Eo); |
case (MDOC_Ed): |
case MDOC_Ed: |
return(MDOC_Bd); |
return(MDOC_Bd); |
case (MDOC_Ef): |
case MDOC_Ef: |
return(MDOC_Bf); |
return(MDOC_Bf); |
case (MDOC_Ek): |
case MDOC_Ek: |
return(MDOC_Bk); |
return(MDOC_Bk); |
case (MDOC_El): |
case MDOC_El: |
return(MDOC_Bl); |
return(MDOC_Bl); |
case (MDOC_Fc): |
case MDOC_Fc: |
return(MDOC_Fo); |
return(MDOC_Fo); |
case (MDOC_Oc): |
case MDOC_Oc: |
return(MDOC_Oo); |
return(MDOC_Oo); |
case (MDOC_Pc): |
case MDOC_Pc: |
return(MDOC_Po); |
return(MDOC_Po); |
case (MDOC_Qc): |
case MDOC_Qc: |
return(MDOC_Qo); |
return(MDOC_Qo); |
case (MDOC_Re): |
case MDOC_Re: |
return(MDOC_Rs); |
return(MDOC_Rs); |
case (MDOC_Sc): |
case MDOC_Sc: |
return(MDOC_So); |
return(MDOC_So); |
case (MDOC_Xc): |
case MDOC_Xc: |
return(MDOC_Xo); |
return(MDOC_Xo); |
default: |
default: |
return(tok); |
return(tok); |
Line 346 rew_alt(enum mdoct tok) |
|
Line 342 rew_alt(enum mdoct tok) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
|
/* |
/* |
* Rewinding to tok, how do we have to handle *p? |
* Rewinding to tok, how do we have to handle *p? |
* REWIND_NONE: *p would delimit tok, but no tok scope is open |
* REWIND_NONE: *p would delimit tok, but no tok scope is open |
Line 358 rew_alt(enum mdoct tok) |
|
Line 353 rew_alt(enum mdoct tok) |
|
* REWIND_ERROR: No tok block is open at all. |
* 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) |
{ |
{ |
|
|
Line 374 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 369 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
REWIND_ERROR : REWIND_NONE); |
REWIND_ERROR : REWIND_NONE); |
|
|
/* |
/* |
* When starting to rewind, skip plain text |
* When starting to rewind, skip plain text |
* and nodes that have already been rewound. |
* and nodes that have already been rewound. |
*/ |
*/ |
if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) |
if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) |
Line 398 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 393 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
|
|
/* |
/* |
* Blocks delimited by our target token get REWIND_MORE. |
* Blocks delimited by our target token get REWIND_MORE. |
* Blocks delimiting our target token get REWIND_NONE. |
* Blocks delimiting our target token get REWIND_NONE. |
*/ |
*/ |
switch (tok) { |
switch (tok) { |
case (MDOC_Bl): |
case MDOC_Bl: |
if (MDOC_It == p->tok) |
if (MDOC_It == p->tok) |
return(REWIND_MORE); |
return(REWIND_MORE); |
break; |
break; |
case (MDOC_It): |
case MDOC_It: |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
if (MDOC_BODY == p->type && MDOC_Bl == p->tok) |
return(REWIND_NONE); |
return(REWIND_NONE); |
break; |
break; |
Line 415 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 410 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
* This is an incomplete and extremely ugly workaround, |
* This is an incomplete and extremely ugly workaround, |
* required to let the OpenBSD tree build. |
* required to let the OpenBSD tree build. |
*/ |
*/ |
case (MDOC_Oo): |
case MDOC_Oo: |
if (MDOC_Op == p->tok) |
if (MDOC_Op == p->tok) |
return(REWIND_MORE); |
return(REWIND_MORE); |
break; |
break; |
case (MDOC_Nm): |
case MDOC_Nm: |
return(REWIND_NONE); |
return(REWIND_NONE); |
case (MDOC_Nd): |
case MDOC_Nd: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ss): |
case MDOC_Ss: |
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
if (MDOC_BODY == p->type && MDOC_Sh == p->tok) |
return(REWIND_NONE); |
return(REWIND_NONE); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Sh): |
case MDOC_Sh: |
|
if (MDOC_ROOT == p->parent->type) |
|
return(REWIND_THIS); |
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
if (MDOC_Nd == p->tok || MDOC_Ss == p->tok || |
MDOC_Sh == p->tok) |
MDOC_Sh == p->tok) |
return(REWIND_MORE); |
return(REWIND_MORE); |
Line 440 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 437 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
* Default block rewinding rules. |
* Default block rewinding rules. |
* In particular, always skip block end markers, |
* In particular, always skip block end markers, |
* and let all blocks rewind Nm children. |
* and let all blocks rewind Nm children. |
|
* Do not warn again when closing a block, |
|
* since closing the body already warned. |
*/ |
*/ |
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
(MDOC_BLOCK == p->type && |
MDOC_BLOCK == type || (MDOC_BLOCK == p->type && |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
return(REWIND_MORE); |
return(REWIND_MORE); |
|
|
Line 456 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 455 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
REWIND_FORCE : REWIND_LATER); |
REWIND_FORCE : REWIND_LATER); |
} |
} |
|
|
|
|
static int |
static int |
rew_elem(struct mdoc *mdoc, enum mdoct tok) |
rew_elem(struct mdoc *mdoc, enum mdoct tok) |
{ |
{ |
Line 471 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
Line 469 rew_elem(struct mdoc *mdoc, enum mdoct tok) |
|
return(rew_last(mdoc, n)); |
return(rew_last(mdoc, n)); |
} |
} |
|
|
|
|
/* |
/* |
* We are trying to close a block identified by tok, |
* We are trying to close a block identified by tok, |
* but the child block *broken is still open. |
* but the child block *broken is still open. |
Line 535 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 532 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, mdoc->parse, line, ppos, |
mandoc_vmsg(MANDOCERR_BLK_NEST, 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 548 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 545 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
return(0); |
return(0); |
} |
} |
|
|
|
|
static int |
static int |
rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
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; |
Line 558 rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
Line 554 rew_sub(enum mdoc_type t, struct mdoc *mdoc, |
|
n = mdoc->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: |
return(1); |
return(1); |
case (REWIND_THIS): |
case REWIND_THIS: |
n->lastline = line - |
n->lastline = line - |
(MDOC_NEWLINE & mdoc->flags && |
(MDOC_NEWLINE & mdoc->flags && |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags)); |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags)); |
break; |
break; |
case (REWIND_FORCE): |
case REWIND_FORCE: |
mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse, |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, 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]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (REWIND_MORE): |
case REWIND_MORE: |
n->lastline = line - |
n->lastline = line - |
(MDOC_NEWLINE & mdoc->flags ? 1 : 0); |
(MDOC_NEWLINE & mdoc->flags ? 1 : 0); |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
case (REWIND_LATER): |
case REWIND_LATER: |
if (make_pending(n, tok, mdoc, 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(mdoc, line, ppos, MANDOCERR_NOSCOPE); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, |
|
mdoc->parse, line, ppos, |
|
mdoc_macronames[tok]); |
return(1); |
return(1); |
} |
} |
break; |
break; |
|
|
dword(struct mdoc *mdoc, int line, int col, const char *p, |
dword(struct mdoc *mdoc, int line, int col, const char *p, |
enum mdelim d, int may_append) |
enum mdelim d, int may_append) |
{ |
{ |
|
|
if (DELIM_MAX == d) |
if (DELIM_MAX == d) |
d = mdoc_isdelim(p); |
d = mdoc_isdelim(p); |
|
|
Line 630 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 628 dword(struct mdoc *mdoc, int line, int col, const char |
|
if ( ! mdoc_word_alloc(mdoc, line, col, p)) |
if ( ! mdoc_word_alloc(mdoc, line, col, p)) |
return(0); |
return(0); |
|
|
if (DELIM_OPEN == d) |
|
mdoc->last->flags |= MDOC_DELIMO; |
|
|
|
/* |
/* |
* Closing delimiters only suppress the preceding space |
* If the word consists of a bare delimiter, |
* when they follow something, not when they start a new |
* flag the new node accordingly, |
* block or element, and not when they follow `No'. |
* unless doing so was vetoed by the invoking macro. |
* |
* Always clear the veto, it is only valid for one word. |
* 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 && |
if (d == DELIM_OPEN) |
mdoc->last->prev->tok != MDOC_No && |
mdoc->last->flags |= MDOC_DELIMO; |
mdoc->last->parent->tok != MDOC_Fd) |
else if (d == DELIM_CLOSE && |
|
! (mdoc->flags & MDOC_NODELIMC) && |
|
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->flags |= MDOC_DELIMC; |
mdoc->last->flags |= MDOC_DELIMC; |
|
|
|
mdoc->flags &= ~MDOC_NODELIMC; |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 690 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 686 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Close out block partial/full explicit. |
* Close out block partial/full explicit. |
*/ |
*/ |
static int |
static int |
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
Line 701 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 696 blk_exp_close(MACRO_PROT_ARGS) |
|
struct mdoc_node *later; /* A sub-block starting later. */ |
struct mdoc_node *later; /* A sub-block starting later. */ |
struct mdoc_node *n; /* For searching backwards. */ |
struct mdoc_node *n; /* For searching backwards. */ |
|
|
int j, lastarg, maxargs, flushed, nl; |
int j, lastarg, maxargs, flushed, nl; |
enum margserr ac; |
enum margserr ac; |
enum mdoct atok, ntok; |
enum mdoct atok, ntok; |
char *p; |
char *p; |
Line 709 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 704 blk_exp_close(MACRO_PROT_ARGS) |
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ec): |
case MDOC_Ec: |
maxargs = 1; |
maxargs = 1; |
break; |
break; |
case (MDOC_Ek): |
case MDOC_Ek: |
mdoc->flags &= ~MDOC_KEEP; |
mdoc->flags &= ~MDOC_KEEP; |
default: |
default: |
maxargs = 0; |
maxargs = 0; |
Line 749 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 744 blk_exp_close(MACRO_PROT_ARGS) |
|
if (NULL == later) |
if (NULL == later) |
break; |
break; |
|
|
/* |
/* |
* When there is a pending sub block, |
* When there is a pending sub block, |
* 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. |
Line 778 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 773 blk_exp_close(MACRO_PROT_ARGS) |
|
later = n; |
later = n; |
} |
} |
|
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_PARSED & mdoc_macros[tok].flags)) { |
/* FIXME: do this in validate */ |
if ('\0' != buf[*pos]) |
if (buf[*pos]) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST); |
mdoc->parse, line, ppos, |
|
"%s %s", mdoc_macronames[tok], |
|
buf + *pos); |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)); |
return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)); |
Line 791 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 787 blk_exp_close(MACRO_PROT_ARGS) |
|
if ( ! rew_sub(MDOC_BODY, mdoc, 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(mdoc, line, ppos, rew_alt(tok))) |
if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok))) |
return(0); |
return(0); |
|
|
Line 843 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 839 blk_exp_close(MACRO_PROT_ARGS) |
|
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, scope, cnt, nc, nl; |
int la, scope, cnt, firstarg, mayopen, nc, nl; |
enum margverr av; |
enum margverr av; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
Line 863 in_line(MACRO_PROT_ARGS) |
|
Line 858 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_An): |
case MDOC_An: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ar): |
case MDOC_Ar: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Fl): |
case MDOC_Fl: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Mt): |
case MDOC_Mt: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Nm): |
case MDOC_Nm: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Pa): |
case MDOC_Pa: |
nc = 1; |
nc = 1; |
break; |
break; |
default: |
default: |
Line 888 in_line(MACRO_PROT_ARGS) |
|
Line 883 in_line(MACRO_PROT_ARGS) |
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == av) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == av) |
if (ARGV_ARG == av) |
Line 898 in_line(MACRO_PROT_ARGS) |
|
Line 893 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
d = DELIM_NONE; |
|
firstarg = 1; |
|
mayopen = 1; |
for (cnt = scope = 0;; ) { |
for (cnt = scope = 0;; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ac == ARGS_ERROR) |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
|
|
/* |
|
* At the end of a macro line, |
|
* opening delimiters do not suppress spacing. |
|
*/ |
|
|
|
if (ac == ARGS_EOLN) { |
|
if (d == DELIM_OPEN) |
|
mdoc->last->flags &= ~MDOC_DELIMO; |
break; |
break; |
if (ARGS_PUNCT == ac) |
} |
|
|
|
/* |
|
* The rest of the macro line is only punctuation, |
|
* to be handled by append_delims(). |
|
* If there were no other arguments, |
|
* do not allow the first one to suppress spacing, |
|
* even if it turns out to be a closing one. |
|
*/ |
|
|
|
if (ac == ARGS_PUNCT) { |
|
if (cnt == 0 && nc == 0) |
|
mdoc->flags |= MDOC_NODELIMC; |
break; |
break; |
|
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
|
MDOC_MAX : lookup(tok, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
* execute it. Close out scope, if open. If no |
* execute it. Close out scope, if open. If no |
* elements have been generated, either create one (nc) |
* elements have been generated, either create one (nc) |
Line 922 in_line(MACRO_PROT_ARGS) |
|
Line 942 in_line(MACRO_PROT_ARGS) |
|
if (scope && ! rew_elem(mdoc, tok)) |
if (scope && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
if ( ! mdoc_elem_alloc(mdoc, line, |
if ( ! mdoc_elem_alloc(mdoc, |
ppos, tok, arg)) |
line, ppos, tok, arg)) |
return(0); |
return(0); |
if ( ! rew_last(mdoc, mdoc->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(mdoc, line, ppos, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
MANDOCERR_MACROEMPTY); |
mdoc->parse, line, ppos, |
|
mdoc_macronames[tok]); |
} |
} |
|
|
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf)) |
Line 938 in_line(MACRO_PROT_ARGS) |
|
Line 959 in_line(MACRO_PROT_ARGS) |
|
if ( ! nl) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
/* |
/* |
* Non-quote-enclosed punctuation. Set up our scope, if |
* Non-quote-enclosed punctuation. Set up our scope, if |
* a word; rewind the scope, if a delimiter; then append |
* a word; rewind the scope, if a delimiter; then append |
* the word. |
* the word. |
*/ |
*/ |
|
|
d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); |
d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); |
Line 951 in_line(MACRO_PROT_ARGS) |
|
Line 972 in_line(MACRO_PROT_ARGS) |
|
if (DELIM_NONE != d) { |
if (DELIM_NONE != d) { |
/* |
/* |
* If we encounter closing punctuation, no word |
* If we encounter closing punctuation, no word |
* has been omitted, no scope is open, and we're |
* has been emitted, no scope is open, and we're |
* allowed to have an empty element, then start |
* allowed to have an empty element, then start |
* a new scope. `Ar', `Fl', and `Li', only do |
* a new scope. |
* this once per invocation. There may be more |
|
* of these (all of them?). |
|
*/ |
*/ |
if (0 == cnt && (nc || MDOC_Li == tok) && |
if ((d == DELIM_CLOSE || |
DELIM_CLOSE == d && ! scope) { |
(d == DELIM_MIDDLE && tok == MDOC_Fl)) && |
if ( ! mdoc_elem_alloc(mdoc, line, |
!cnt && !scope && nc && mayopen) { |
ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, |
|
line, ppos, tok, arg)) |
return(0); |
return(0); |
if (MDOC_Ar == tok || MDOC_Li == tok || |
|
MDOC_Fl == tok) |
|
cnt++; |
|
scope = 1; |
scope = 1; |
|
cnt++; |
|
if (MDOC_Nm == tok) |
|
mayopen = 0; |
} |
} |
/* |
/* |
* Close out our scope, if one is open, before |
* Close out our scope, if one is open, before |
Line 974 in_line(MACRO_PROT_ARGS) |
|
Line 994 in_line(MACRO_PROT_ARGS) |
|
if (scope && ! rew_elem(mdoc, tok)) |
if (scope && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
scope = 0; |
scope = 0; |
} else if ( ! scope) { |
if (tok == MDOC_Fn) |
|
mayopen = 0; |
|
} else if (mayopen && !scope) { |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
scope = 1; |
scope = 1; |
|
cnt++; |
} |
} |
|
|
if (DELIM_NONE == d) |
|
cnt++; |
|
|
|
if ( ! dword(mdoc, line, la, p, d, |
if ( ! dword(mdoc, line, la, p, d, |
MDOC_JOIN & mdoc_macros[tok].flags)) |
MDOC_JOIN & mdoc_macros[tok].flags)) |
return(0); |
return(0); |
|
|
/* |
/* |
|
* If the first argument is a closing delimiter, |
|
* do not suppress spacing before it. |
|
*/ |
|
|
|
if (firstarg && d == DELIM_CLOSE && !nc) |
|
mdoc->last->flags &= ~MDOC_DELIMC; |
|
firstarg = 0; |
|
|
|
/* |
* `Fl' macros have their scope re-opened with each new |
* `Fl' macros have their scope re-opened with each new |
* 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. |
Line 1015 in_line(MACRO_PROT_ARGS) |
|
Line 1044 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); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY); |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
} |
} |
|
|
if ( ! nl) |
if ( ! nl) |
Line 1023 in_line(MACRO_PROT_ARGS) |
|
Line 1053 in_line(MACRO_PROT_ARGS) |
|
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
Line 1040 blk_full(MACRO_PROT_ARGS) |
|
Line 1069 blk_full(MACRO_PROT_ARGS) |
|
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
|
/* Skip items outside lists. */ |
|
|
|
if (tok == MDOC_It) { |
|
for (n = mdoc->last; n; n = n->parent) |
|
if (n->tok == MDOC_Bl && |
|
! (n->flags & MDOC_VALID)) |
|
break; |
|
if (n == NULL) { |
|
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
|
line, ppos, "It %s", buf + *pos); |
|
if ( ! mdoc_elem_alloc(mdoc, line, ppos, |
|
MDOC_br, NULL)) |
|
return(0); |
|
return(rew_elem(mdoc, MDOC_br)); |
|
} |
|
} |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
Line 1065 blk_full(MACRO_PROT_ARGS) |
|
Line 1111 blk_full(MACRO_PROT_ARGS) |
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == av) |
if (ARGV_EOLN == av) |
break; |
break; |
Line 1086 blk_full(MACRO_PROT_ARGS) |
|
Line 1132 blk_full(MACRO_PROT_ARGS) |
|
* parsed, even though `It' macros in general are parsed. |
* parsed, even though `It' macros in general are parsed. |
*/ |
*/ |
nparsed = MDOC_It == tok && |
nparsed = MDOC_It == tok && |
MDOC_Bl == mdoc->last->parent->tok && |
MDOC_Bl == mdoc->last->parent->tok && |
LIST_diag == mdoc->last->parent->norm->Bl.type; |
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 |
Line 1140 blk_full(MACRO_PROT_ARGS) |
|
Line 1186 blk_full(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
/* |
/* |
* Emit leading punctuation (i.e., punctuation before |
* Emit leading punctuation (i.e., punctuation before |
* the MDOC_HEAD) for non-phrase types. |
* the MDOC_HEAD) for non-phrase types. |
*/ |
*/ |
|
|
if (NULL == head && |
if (NULL == head && |
ARGS_PEND != ac && |
ARGS_PEND != ac && |
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 == mdoc_isdelim(p)) { |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1164 blk_full(MACRO_PROT_ARGS) |
|
Line 1210 blk_full(MACRO_PROT_ARGS) |
|
head = mdoc->last; |
head = mdoc->last; |
} |
} |
|
|
if (ARGS_PHRASE == ac || |
if (ARGS_PHRASE == ac || |
ARGS_PEND == ac || |
ARGS_PEND == ac || |
ARGS_PPHRASE == ac) { |
ARGS_PPHRASE == ac) { |
/* |
/* |
* If we haven't opened a body yet, rewind the |
* If we haven't opened a body yet, rewind the |
* head; if we have, rewind that instead. |
* head; if we have, rewind that instead. |
Line 1175 blk_full(MACRO_PROT_ARGS) |
|
Line 1221 blk_full(MACRO_PROT_ARGS) |
|
mtt = body ? MDOC_BODY : MDOC_HEAD; |
mtt = body ? MDOC_BODY : MDOC_HEAD; |
if ( ! rew_sub(mtt, mdoc, 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(mdoc, line, ppos, tok)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) |
Line 1200 blk_full(MACRO_PROT_ARGS) |
|
Line 1246 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
ntok = nparsed || ARGS_QWORD == ac ? |
ntok = nparsed || ARGS_QWORD == ac ? |
MDOC_MAX : lookup(tok, p); |
MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(mdoc, line, la, p, DELIM_MAX, |
if ( ! dword(mdoc, line, la, p, DELIM_MAX, |
Line 1220 blk_full(MACRO_PROT_ARGS) |
|
Line 1266 blk_full(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
head = mdoc->last; |
head = mdoc->last; |
} |
} |
|
|
if (nl && ! append_delims(mdoc, line, pos, buf)) |
if (nl && ! append_delims(mdoc, line, pos, buf)) |
return(0); |
return(0); |
|
|
Line 1236 blk_full(MACRO_PROT_ARGS) |
|
Line 1282 blk_full(MACRO_PROT_ARGS) |
|
* sub-block. |
* sub-block. |
*/ |
*/ |
for (n = mdoc->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)) { |
n->pending = head; |
n->pending = head; |
return(1); |
return(1); |
} |
} |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
blk_part_imp(MACRO_PROT_ARGS) |
blk_part_imp(MACRO_PROT_ARGS) |
{ |
{ |
Line 1315 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1360 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 == mdoc_isdelim(p)) { |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1355 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1400 blk_part_imp(MACRO_PROT_ARGS) |
|
* until the rew_sub() call closing out the sub-block. |
* until the rew_sub() call closing out the sub-block. |
*/ |
*/ |
for (n = mdoc->last; n && n != body && n != blk->parent; |
for (n = mdoc->last; n && n != body && n != blk->parent; |
n = n->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)) { |
Line 1366 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1411 blk_part_imp(MACRO_PROT_ARGS) |
|
return(1); |
return(1); |
} |
} |
} |
} |
|
assert(n == body); |
|
|
/* |
if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
* If we can't rewind to our body, then our scope has already |
|
* been closed by another macro (like `Oc' closing `Op'). This |
|
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
|
* crufty use of `Op' breakage. |
|
*/ |
|
if (n != body) |
|
mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, |
|
"%s broken", mdoc_macronames[tok]); |
|
|
|
if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos)) |
|
return(0); |
return(0); |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
Line 1387 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1423 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |
|
|
if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos)) |
return(0); |
return(0); |
|
|
/* Move trailing .Ns out of scope. */ |
/* Move trailing .Ns out of scope. */ |
Line 1400 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1436 blk_part_imp(MACRO_PROT_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
Line 1420 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1455 blk_part_exp(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if ( ! mdoc_block_alloc(mdoc, 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; |
Line 1436 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1471 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 == mdoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
return(0); |
return(0); |
Line 1508 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1543 blk_part_exp(MACRO_PROT_ARGS) |
|
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
in_line_argn(MACRO_PROT_ARGS) |
in_line_argn(MACRO_PROT_ARGS) |
{ |
{ |
Line 1531 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1564 in_line_argn(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ap): |
case MDOC_Ap: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_No): |
case MDOC_Ns: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ns): |
case MDOC_Ux: |
/* FALLTHROUGH */ |
|
case (MDOC_Ux): |
|
maxargs = 0; |
maxargs = 0; |
break; |
break; |
case (MDOC_Bx): |
case MDOC_Bx: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Xr): |
case MDOC_Es: |
|
/* FALLTHROUGH */ |
|
case MDOC_Xr: |
maxargs = 2; |
maxargs = 2; |
break; |
break; |
default: |
default: |
Line 1557 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1590 in_line_argn(MACRO_PROT_ARGS) |
|
if (ARGV_WORD == av) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == av) |
if (ARGV_EOLN == av) |
break; |
break; |
Line 1579 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1612 in_line_argn(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
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(mdoc, line, la, p, DELIM_OPEN, 0)) |
if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0)) |
return(0); |
return(0); |
continue; |
continue; |
} else if (0 == j) |
} else if (0 == j) |
if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
if (j == maxargs && ! flushed) { |
if (j == maxargs && ! flushed) { |
Line 1608 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1641 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 != mdoc_isdelim(p)) { |
if ( ! rew_elem(mdoc, tok)) |
if ( ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
Line 1622 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1655 in_line_argn(MACRO_PROT_ARGS) |
|
j++; |
j++; |
} |
} |
|
|
if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg)) |
if (0 == j && ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
/* Close out in a consistent state. */ |
/* Close out in a consistent state. */ |
Line 1634 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1667 in_line_argn(MACRO_PROT_ARGS) |
|
return(append_delims(mdoc, line, pos, buf)); |
return(append_delims(mdoc, line, pos, buf)); |
} |
} |
|
|
|
|
static int |
static int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
Line 1660 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1692 in_line_eoln(MACRO_PROT_ARGS) |
|
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == av) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == av) |
if (ARGV_ARG == av) |
continue; |
continue; |
Line 1704 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1736 in_line_eoln(MACRO_PROT_ARGS) |
|
return(rew_elem(mdoc, tok)); |
return(rew_elem(mdoc, tok)); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
ctx_synopsis(MACRO_PROT_ARGS) |
ctx_synopsis(MACRO_PROT_ARGS) |
{ |
{ |
Line 1732 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1762 ctx_synopsis(MACRO_PROT_ARGS) |
|
return(blk_part_imp(mdoc, tok, line, ppos, pos, buf)); |
return(blk_part_imp(mdoc, tok, line, ppos, pos, buf)); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
obsolete(MACRO_PROT_ARGS) |
|
{ |
|
|
|
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS); |
|
return(1); |
|
} |
|
|
|
|
|
/* |
/* |
* Phrases occur within `Bl -column' entries, separated by `Ta' or tabs. |
* Phrases occur within `Bl -column' entries, separated by `Ta' or tabs. |
* They're unusual because they're basically free-form text until a |
* They're unusual because they're basically free-form text until a |
Line 1782 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
Line 1801 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
phrase_ta(MACRO_PROT_ARGS) |
phrase_ta(MACRO_PROT_ARGS) |
{ |
{ |
Line 1798 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1815 phrase_ta(MACRO_PROT_ARGS) |
|
while (NULL != n && MDOC_Bl != n->tok) |
while (NULL != n && MDOC_Bl != n->tok) |
n = n->parent; |
n = n->parent; |
if (NULL == n || LIST_column != n->norm->Bl.type) { |
if (NULL == n || LIST_column != n->norm->Bl.type) { |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA); |
mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, |
|
line, ppos, "Ta"); |
return(1); |
return(1); |
} |
} |
|
|