version 1.208, 2016/08/20 15:58:21 |
version 1.215, 2017/02/11 15:47:16 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2016 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 50 static int find_pending(struct roff_man *, int, int, |
|
Line 50 static int find_pending(struct roff_man *, int, int, |
|
struct roff_node *); |
struct roff_node *); |
static int lookup(struct roff_man *, int, int, int, const char *); |
static int lookup(struct roff_man *, int, int, int, const char *); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
|
static void break_intermediate(struct roff_node *, |
|
struct roff_node *); |
static int parse_rest(struct roff_man *, int, int, int *, char *); |
static int parse_rest(struct roff_man *, int, int, int *, char *); |
static int rew_alt(int); |
static int rew_alt(int); |
static void rew_elem(struct roff_man *, int); |
static void rew_elem(struct roff_man *, int); |
Line 216 mdoc_endparse(struct roff_man *mdoc) |
|
Line 218 mdoc_endparse(struct roff_man *mdoc) |
|
|
|
/* Scan for open explicit scopes. */ |
/* Scan for open explicit scopes. */ |
|
|
n = mdoc->last->flags & MDOC_VALID ? |
n = mdoc->last->flags & NODE_VALID ? |
mdoc->last->parent : mdoc->last; |
mdoc->last->parent : mdoc->last; |
|
|
for ( ; n; n = n->parent) |
for ( ; n; n = n->parent) |
|
|
rew_last(struct roff_man *mdoc, const struct roff_node *to) |
rew_last(struct roff_man *mdoc, const struct roff_node *to) |
{ |
{ |
|
|
if (to->flags & MDOC_VALID) |
if (to->flags & NODE_VALID) |
return; |
return; |
|
|
while (mdoc->last != to) { |
while (mdoc->last != to) { |
mdoc_state(mdoc, mdoc->last); |
mdoc_state(mdoc, mdoc->last); |
mdoc->last->flags |= MDOC_VALID | MDOC_ENDED; |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->last = mdoc->last->parent; |
mdoc->last = mdoc->last->parent; |
} |
} |
mdoc_state(mdoc, mdoc->last); |
mdoc_state(mdoc, mdoc->last); |
mdoc->last->flags |= MDOC_VALID | MDOC_ENDED; |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
} |
} |
|
|
Line 298 rew_pending(struct roff_man *mdoc, const struct roff_n |
|
Line 300 rew_pending(struct roff_man *mdoc, const struct roff_n |
|
default: |
default: |
return; |
return; |
} |
} |
if ( ! (n->flags & MDOC_BROKEN)) |
if ( ! (n->flags & NODE_BROKEN)) |
return; |
return; |
} else |
} else |
n = mdoc->last; |
n = mdoc->last; |
Line 309 rew_pending(struct roff_man *mdoc, const struct roff_n |
|
Line 311 rew_pending(struct roff_man *mdoc, const struct roff_n |
|
|
|
if (n->type == ROFFT_BLOCK || |
if (n->type == ROFFT_BLOCK || |
n->type == ROFFT_HEAD) { |
n->type == ROFFT_HEAD) { |
if (n->flags & MDOC_ENDED) |
if (n->flags & NODE_ENDED) |
break; |
break; |
else |
else |
return; |
return; |
Line 376 rew_elem(struct roff_man *mdoc, int tok) |
|
Line 378 rew_elem(struct roff_man *mdoc, int tok) |
|
rew_last(mdoc, n); |
rew_last(mdoc, n); |
} |
} |
|
|
|
static void |
|
break_intermediate(struct roff_node *n, struct roff_node *breaker) |
|
{ |
|
while (n != breaker) { |
|
if ( ! (n->flags & NODE_VALID)) |
|
n->flags |= NODE_BROKEN; |
|
n = n->parent; |
|
} |
|
} |
|
|
/* |
/* |
* If there is an open sub-block of the target requiring |
* If there is an open sub-block of the target requiring |
* explicit close-out, postpone closing out the target until |
* explicit close-out, postpone closing out the target until |
Line 388 find_pending(struct roff_man *mdoc, int tok, int line, |
|
Line 400 find_pending(struct roff_man *mdoc, int tok, int line, |
|
struct roff_node *n; |
struct roff_node *n; |
int irc; |
int irc; |
|
|
|
if (target->flags & NODE_VALID) |
|
return 0; |
|
|
irc = 0; |
irc = 0; |
for (n = mdoc->last; n != NULL && n != target; n = n->parent) { |
for (n = mdoc->last; n != NULL && n != target; n = n->parent) { |
if (n->flags & MDOC_ENDED) { |
if (n->flags & NODE_ENDED) |
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
continue; |
} |
|
if (n->type == ROFFT_BLOCK && |
if (n->type == ROFFT_BLOCK && |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
irc = 1; |
irc = 1; |
n->flags = MDOC_BROKEN; |
break_intermediate(mdoc->last, n); |
|
n->flags |= NODE_BROKEN; |
if (target->type == ROFFT_HEAD) |
if (target->type == ROFFT_HEAD) |
target->flags = MDOC_ENDED; |
target->flags |= NODE_ENDED; |
else if ( ! (target->flags & MDOC_ENDED)) { |
else if ( ! (target->flags & NODE_ENDED)) { |
mandoc_vmsg(MANDOCERR_BLK_NEST, |
mandoc_vmsg(MANDOCERR_BLK_NEST, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"%s breaks %s", mdoc_macronames[tok], |
"%s breaks %s", mdoc_macronames[tok], |
Line 444 dword(struct roff_man *mdoc, int line, int col, const |
|
Line 457 dword(struct roff_man *mdoc, int line, int col, const |
|
*/ |
*/ |
|
|
if (d == DELIM_OPEN) |
if (d == DELIM_OPEN) |
mdoc->last->flags |= MDOC_DELIMO; |
mdoc->last->flags |= NODE_DELIMO; |
else if (d == DELIM_CLOSE && |
else if (d == DELIM_CLOSE && |
! (mdoc->flags & MDOC_NODELIMC) && |
! (mdoc->flags & MDOC_NODELIMC) && |
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->flags |= MDOC_DELIMC; |
mdoc->last->flags |= NODE_DELIMC; |
mdoc->flags &= ~MDOC_NODELIMC; |
mdoc->flags &= ~MDOC_NODELIMC; |
} |
} |
|
|
Line 481 append_delims(struct roff_man *mdoc, int line, int *po |
|
Line 494 append_delims(struct roff_man *mdoc, int line, int *po |
|
*/ |
*/ |
|
|
if (mandoc_eos(p, strlen(p))) |
if (mandoc_eos(p, strlen(p))) |
mdoc->last->flags |= MDOC_EOS; |
mdoc->last->flags |= NODE_EOS; |
} |
} |
} |
} |
|
|
Line 549 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 562 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
/* Search backwards for the beginning of our own body. */ |
|
|
|
atok = rew_alt(tok); |
|
body = NULL; |
|
for (n = mdoc->last; n; n = n->parent) { |
|
if (n->flags & NODE_ENDED || n->tok != atok || |
|
n->type != ROFFT_BODY || n->end != ENDBODY_NOT) |
|
continue; |
|
body = n; |
|
break; |
|
} |
|
|
/* |
/* |
* Search backwards for beginnings of blocks, |
* Search backwards for beginnings of blocks, |
* both of our own and of pending sub-blocks. |
* both of our own and of pending sub-blocks. |
*/ |
*/ |
|
|
atok = rew_alt(tok); |
endbody = itblk = later = NULL; |
body = endbody = itblk = later = NULL; |
|
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (n->flags & MDOC_ENDED) { |
if (n->flags & NODE_ENDED) |
if ( ! (n->flags & MDOC_VALID)) |
|
n->flags |= MDOC_BROKEN; |
|
continue; |
continue; |
} |
|
|
|
/* Remember the start of our own body. */ |
/* |
|
* Mismatching end macros can never break anything |
|
* and we only care about the breaking of BLOCKs. |
|
*/ |
|
|
if (n->type == ROFFT_BODY && atok == n->tok) { |
if (body == NULL || n->type != ROFFT_BLOCK) |
if (n->end == ENDBODY_NOT) |
|
body = n; |
|
continue; |
continue; |
} |
|
|
|
if (n->type != ROFFT_BLOCK || n->tok == MDOC_Nm) |
/* |
|
* SYNOPSIS name blocks can not be broken themselves, |
|
* but they do get broken together with a broken child. |
|
*/ |
|
|
|
if (n->tok == MDOC_Nm) { |
|
if (later != NULL) |
|
n->flags |= NODE_BROKEN | NODE_ENDED; |
continue; |
continue; |
|
} |
|
|
if (n->tok == MDOC_It) { |
if (n->tok == MDOC_It) { |
itblk = n; |
itblk = n; |
Line 580 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 609 blk_exp_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (atok == n->tok) { |
if (atok == n->tok) { |
assert(body); |
|
|
|
/* |
/* |
* Found the start of our own block. |
* Found the start of our own block. |
Line 609 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 637 blk_exp_close(MACRO_PROT_ARGS) |
|
atok, body, ENDBODY_SPACE); |
atok, body, ENDBODY_SPACE); |
|
|
if (tok == MDOC_El) |
if (tok == MDOC_El) |
itblk->flags |= MDOC_ENDED | MDOC_BROKEN; |
itblk->flags |= NODE_ENDED | NODE_BROKEN; |
|
|
/* |
/* |
* If a block closing macro taking arguments |
* If a block closing macro taking arguments |
Line 622 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 650 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
/* Explicit blocks close out description lines. */ |
/* |
|
* Explicit blocks close out description lines, but |
|
* even those can get broken together with a child. |
|
*/ |
|
|
if (n->tok == MDOC_Nd) { |
if (n->tok == MDOC_Nd) { |
rew_last(mdoc, n); |
if (later != NULL) |
|
n->flags |= NODE_BROKEN | NODE_ENDED; |
|
else |
|
rew_last(mdoc, n); |
continue; |
continue; |
} |
} |
|
|
/* Breaking an open sub block. */ |
/* Breaking an open sub block. */ |
|
|
n->flags |= MDOC_BROKEN; |
break_intermediate(mdoc->last, body); |
|
n->flags |= NODE_BROKEN; |
if (later == NULL) |
if (later == NULL) |
later = n; |
later = n; |
} |
} |
Line 639 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 674 blk_exp_close(MACRO_PROT_ARGS) |
|
if (body == NULL) { |
if (body == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, mdoc_macronames[tok]); |
if (later != NULL) |
|
later->flags &= ~MDOC_BROKEN; |
|
if (maxargs && endbody == NULL) { |
if (maxargs && endbody == NULL) { |
/* |
/* |
* Stray .Ec without previous .Eo: |
* Stray .Ec without previous .Eo: |
Line 697 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 730 blk_exp_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (n != NULL) { |
if (n != NULL) { |
if (ntok != TOKEN_NONE && n->flags & MDOC_BROKEN) { |
pending = 0; |
|
if (ntok != TOKEN_NONE && n->flags & NODE_BROKEN) { |
target = n; |
target = n; |
do |
do |
target = target->parent; |
target = target->parent; |
while ( ! (target->flags & MDOC_ENDED)); |
while ( ! (target->flags & NODE_ENDED)); |
pending = find_pending(mdoc, ntok, line, ppos, |
pending = find_pending(mdoc, ntok, line, ppos, target); |
target); |
} |
} else |
|
pending = 0; |
|
if ( ! pending) |
if ( ! pending) |
rew_pending(mdoc, n); |
rew_pending(mdoc, n); |
} |
} |
Line 760 in_line(MACRO_PROT_ARGS) |
|
Line 792 in_line(MACRO_PROT_ARGS) |
|
|
|
if (ac == ARGS_EOLN) { |
if (ac == ARGS_EOLN) { |
if (d == DELIM_OPEN) |
if (d == DELIM_OPEN) |
mdoc->last->flags &= ~MDOC_DELIMO; |
mdoc->last->flags &= ~NODE_DELIMO; |
break; |
break; |
} |
} |
|
|
Line 854 in_line(MACRO_PROT_ARGS) |
|
Line 886 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (firstarg && d == DELIM_CLOSE && !nc) |
if (firstarg && d == DELIM_CLOSE && !nc) |
mdoc->last->flags &= ~MDOC_DELIMC; |
mdoc->last->flags &= ~NODE_DELIMC; |
firstarg = 0; |
firstarg = 0; |
|
|
/* |
/* |
Line 917 blk_full(MACRO_PROT_ARGS) |
|
Line 949 blk_full(MACRO_PROT_ARGS) |
|
|
|
blk = NULL; |
blk = NULL; |
for (n = mdoc->last; n != NULL; n = n->parent) { |
for (n = mdoc->last; n != NULL; n = n->parent) { |
if (n->flags & MDOC_ENDED) { |
if (n->flags & NODE_ENDED) { |
if ( ! (n->flags & MDOC_VALID)) |
if ( ! (n->flags & NODE_VALID)) |
n->flags |= MDOC_BROKEN; |
n->flags |= NODE_BROKEN; |
continue; |
continue; |
} |
} |
if (n->type != ROFFT_BLOCK) |
if (n->type != ROFFT_BLOCK) |
Line 978 blk_full(MACRO_PROT_ARGS) |
|
Line 1010 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Close out prior implicit scopes. */ |
/* Close out prior implicit scopes. */ |
|
|
rew_last(mdoc, n); |
rew_pending(mdoc, n); |
} |
} |
|
|
/* Skip items outside lists. */ |
/* Skip items outside lists. */ |
Line 1120 blk_full(MACRO_PROT_ARGS) |
|
Line 1152 blk_full(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
if (blk->flags & MDOC_VALID) |
if (blk->flags & NODE_VALID) |
return; |
return; |
if (head == NULL) |
if (head == NULL) |
head = roff_head_alloc(mdoc, line, ppos, tok); |
head = roff_head_alloc(mdoc, line, ppos, tok); |
Line 1455 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1487 phrase_ta(MACRO_PROT_ARGS) |
|
|
|
body = NULL; |
body = NULL; |
for (n = mdoc->last; n != NULL; n = n->parent) { |
for (n = mdoc->last; n != NULL; n = n->parent) { |
if (n->flags & MDOC_ENDED) |
if (n->flags & NODE_ENDED) |
continue; |
continue; |
if (n->tok == MDOC_It && n->type == ROFFT_BODY) |
if (n->tok == MDOC_It && n->type == ROFFT_BODY) |
body = n; |
body = n; |