version 1.87, 2010/07/01 14:28:12 |
version 1.95, 2010/10/01 21:51:13 |
|
|
/* $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 |
Line 34 enum rew { /* see rew_dohalt() */ |
|
Line 35 enum rew { /* see rew_dohalt() */ |
|
REWIND_THIS, |
REWIND_THIS, |
REWIND_MORE, |
REWIND_MORE, |
REWIND_LATER, |
REWIND_LATER, |
REWIND_ERROR, |
REWIND_ERROR |
}; |
}; |
|
|
static int blk_full(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
Line 97 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 98 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 138 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 207 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 392 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 389 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
if (MDOC_Op == p->tok) |
if (MDOC_Op == p->tok) |
return(REWIND_MORE); |
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): |
Line 409 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 408 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. |
*/ |
*/ |
if (ENDBODY_NOT != p->end || (MDOC_BLOCK == p->type && |
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
|
(MDOC_BLOCK == p->type && |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
return(REWIND_MORE); |
return(REWIND_MORE); |
|
|
Line 507 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 508 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", |
mdoc_vmsg(m, MANDOCERR_SCOPENEST, line, ppos, |
mdoc_macronames[tok], mdoc_macronames[broken->tok]); |
"%s breaks %s", mdoc_macronames[tok], |
|
mdoc_macronames[broken->tok]); |
return(1); |
return(1); |
} |
} |
|
|
Line 542 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 544 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(make_pending(n, tok, m, line, ppos)); |
return(make_pending(n, tok, m, line, ppos)); |
case (REWIND_ERROR): |
case (REWIND_ERROR): |
/* XXX Make this non-fatal. */ |
/* XXX Make this non-fatal. */ |
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos, |
|
"%s cannot break %s", mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
return 0; |
return 0; |
} |
} |
break; |
break; |
Line 602 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 606 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 653 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 657 blk_exp_close(MACRO_PROT_ARGS) |
|
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 1018 blk_full(MACRO_PROT_ARGS) |
|
Line 1022 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 1255 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1262 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 1290 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1297 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 && ! mdoc_vmsg(m, MANDOCERR_SCOPENEST, |
"%s broken", mdoc_macronames[tok])) |
line, ppos, "%s broken", mdoc_macronames[tok])) |
return(0); |
return(0); |
|
|
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
Line 1572 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1579 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 1635 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1645 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 1647 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1657 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)); |
} |
} |
|
|