=================================================================== RCS file: /cvs/mandoc/mdoc_macro.c,v retrieving revision 1.160 retrieving revision 1.167 diff -u -p -r1.160 -r1.167 --- mandoc/mdoc_macro.c 2014/12/20 02:26:57 1.160 +++ mandoc/mdoc_macro.c 2015/02/02 15:02:49 1.167 @@ -1,7 +1,7 @@ -/* $Id: mdoc_macro.c,v 1.160 2014/12/20 02:26:57 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.167 2015/02/02 15:02:49 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons - * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze + * Copyright (c) 2010, 2012-2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -35,9 +35,7 @@ enum rew { /* see rew_dohalt() */ REWIND_NONE, REWIND_THIS, REWIND_MORE, - REWIND_FORCE, - REWIND_LATER, - REWIND_ERROR + REWIND_FORCE }; static void blk_full(MACRO_PROT_ARGS); @@ -65,6 +63,7 @@ static enum rew rew_dohalt(enum mdoct, enum mdoc_type, const struct mdoc_node *); static void rew_elem(struct mdoc *, enum mdoct); static void rew_last(struct mdoc *, const struct mdoc_node *); +static void rew_pending(struct mdoc *, const struct mdoc_node *); static void rew_sub(enum mdoc_type, struct mdoc *, enum mdoct, int, int); @@ -263,6 +262,9 @@ lookup(struct mdoc *mdoc, enum mdoct from, int line, i return(MDOC_MAX); } +/* + * Rewind up to and including a specific node. + */ static void rew_last(struct mdoc *mdoc, const struct mdoc_node *to) { @@ -271,6 +273,9 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to assert(to); mdoc->next = MDOC_NEXT_SIBLING; while (mdoc->last != to) { + if ( ! (mdoc->last->flags & MDOC_VALID)) + mdoc->last->lastline = to->lastline - + (mdoc->flags & MDOC_NEWLINE ? 1 : 0); /* * Save the parent here, because we may delete the * mdoc->last node in the post-validation phase and reset @@ -288,6 +293,25 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to } /* + * Rewind up to a specific block, including all blocks that broke it. + */ +static void +rew_pending(struct mdoc *mdoc, const struct mdoc_node *n) +{ + + rew_last(mdoc, n); + + if (n->type != MDOC_BLOCK) + return; + + while ((n = n->pending) != NULL) { + rew_last(mdoc, n); + if (n->type == MDOC_HEAD) + mdoc_body_alloc(mdoc, n->line, n->pos, n->tok); + } +} + +/* * For a block closing macro, return the corresponding opening one. * Otherwise, return the macro itself. */ @@ -340,8 +364,6 @@ rew_alt(enum mdoct tok) * 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 rew_dohalt(enum mdoct tok, enum mdoc_type type, @@ -355,15 +377,13 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, * instance anyway. */ if (MDOC_ROOT == p->type) - return(MDOC_BLOCK == type && - MDOC_EXPLICIT & mdoc_macros[tok].flags ? - REWIND_ERROR : REWIND_NONE); + return(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) + if (p->type == MDOC_TEXT || p->flags & (MDOC_VALID | MDOC_BREAK)) return(REWIND_MORE); /* @@ -372,8 +392,7 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, */ tok = rew_alt(tok); if (tok == p->tok) - return(p->end ? REWIND_NONE : - type == p->type ? REWIND_THIS : REWIND_MORE); + return(type == p->type ? REWIND_THIS : REWIND_MORE); /* * While elements do require rewinding for themselves, @@ -387,24 +406,10 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, * Blocks delimiting our target token get REWIND_NONE. */ switch (tok) { - case MDOC_Bl: - if (MDOC_It == p->tok) - return(REWIND_MORE); - break; case MDOC_It: if (MDOC_BODY == p->type && MDOC_Bl == p->tok) return(REWIND_NONE); break; - /* - * XXX Badly nested block handling still fails badly - * 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; case MDOC_Nm: return(REWIND_NONE); case MDOC_Nd: @@ -426,24 +431,19 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, /* * Default block rewinding rules. - * In particular, always skip block end markers, - * and let all blocks rewind Nm children. + * In particular, 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 || - MDOC_BLOCK == type || (MDOC_BLOCK == p->type && - ! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) + if (MDOC_Nm == p->tok || + MDOC_BLOCK == type || MDOC_BLOCK == p->type) return(REWIND_MORE); /* * By default, closing out full blocks - * forces closing of broken explicit blocks, - * while closing out partial blocks - * allows delayed rewinding by default. + * forces closing of broken explicit blocks. */ - return (&blk_full == mdoc_macros[tok].fp ? - REWIND_FORCE : REWIND_LATER); + return (REWIND_FORCE); } static void @@ -463,7 +463,7 @@ rew_elem(struct mdoc *mdoc, enum mdoct tok) * We are trying to close a block identified by tok, * but the child block *broken is still open. * Thus, postpone closing the tok block - * until the rew_sub call closing *broken. + * until the rew_pending() call closing *broken. */ static int make_pending(struct mdoc_node *broken, enum mdoct tok, @@ -533,6 +533,8 @@ make_pending(struct mdoc_node *broken, enum mdoct tok, */ broken->pending = breaker; breaker->flags |= MDOC_BREAK; + if (breaker->body != NULL) + breaker->body->flags |= MDOC_BREAK; mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, "%s breaks %s", mdoc_macronames[tok], mdoc_macronames[broken->tok]); @@ -578,31 +580,11 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc, to = n; n = n->parent; continue; - case REWIND_LATER: - if (make_pending(n, tok, mdoc, line, ppos) || - t != MDOC_BLOCK) - return; - /* FALLTHROUGH */ - case REWIND_ERROR: - mandoc_msg(MANDOCERR_BLK_NOTOPEN, - mdoc->parse, line, ppos, - mdoc_macronames[tok]); - return; } break; } assert(n); - rew_last(mdoc, n); - - /* - * The current block extends an enclosing block. - * Now that the current block ends, close the enclosing block, too. - */ - while ((n = n->pending) != NULL) { - rew_last(mdoc, n); - if (n->type == MDOC_HEAD) - mdoc_body_alloc(mdoc, n->line, n->pos, n->tok); - } + rew_pending(mdoc, n); } /* @@ -716,9 +698,9 @@ blk_exp_close(MACRO_PROT_ARGS) struct mdoc_node *body; /* Our own body. */ struct mdoc_node *endbody; /* Our own end marker. */ struct mdoc_node *later; /* A sub-block starting later. */ - struct mdoc_node *n; /* For searching backwards. */ + struct mdoc_node *n; /* Search back to our block. */ - int flushed, have_it, j, lastarg, maxargs, nl; + int have_it, j, lastarg, maxargs, nl; enum margserr ac; enum mdoct atok, ntok; char *p; @@ -746,14 +728,16 @@ blk_exp_close(MACRO_PROT_ARGS) atok = rew_alt(tok); body = endbody = later = NULL; for (n = mdoc->last; n; n = n->parent) { - if (n->flags & MDOC_VALID) + if (n->flags & (MDOC_VALID | MDOC_BREAK)) continue; /* Remember the start of our own body. */ if (n->type == MDOC_BODY && atok == n->tok) { - if (n->end == ENDBODY_NOT) + if (n->end == ENDBODY_NOT) { body = n; + n->lastline = line; + } continue; } @@ -766,6 +750,7 @@ blk_exp_close(MACRO_PROT_ARGS) } if (atok == n->tok) { + n->lastline = line; assert(body); /* @@ -779,9 +764,9 @@ blk_exp_close(MACRO_PROT_ARGS) break; /* - * When there is a pending sub block, - * postpone closing out the current block - * until the rew_sub() closing out the sub-block. + * When there is a pending sub block, postpone + * closing out the current block until the + * rew_pending() closing out the sub-block. */ make_pending(later, tok, mdoc, line, ppos); @@ -791,20 +776,17 @@ blk_exp_close(MACRO_PROT_ARGS) * the scope - of the current block ends. */ - mdoc_endbody_alloc(mdoc, line, ppos, + endbody = mdoc_endbody_alloc(mdoc, line, ppos, atok, body, ENDBODY_SPACE); /* * If a block closing macro taking arguments * breaks another block, put the arguments - * into the end marker and remeber the - * end marker in order to close it out. + * into the end marker. */ - if (maxargs) { - endbody = mdoc->last; + if (maxargs) mdoc->next = MDOC_NEXT_CHILD; - } break; } @@ -818,40 +800,43 @@ blk_exp_close(MACRO_PROT_ARGS) ! (mdoc_macros[later->tok].flags & MDOC_EXPLICIT)) later = n; } - rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + if (body == NULL) { + mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, + line, ppos, mdoc_macronames[tok]); + if (maxargs && endbody == NULL) { + /* + * Stray .Ec without previous .Eo: + * Break the output line, keep the arguments. + */ + mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); + rew_elem(mdoc, MDOC_br); + } + } else if (endbody == NULL) { + rew_last(mdoc, body); + if (maxargs) + mdoc_tail_alloc(mdoc, line, ppos, atok); + } + if ( ! (mdoc_macros[tok].flags & MDOC_PARSED)) { if (buf[*pos] != '\0') mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, line, ppos, "%s %s", mdoc_macronames[tok], buf + *pos); - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + if (endbody == NULL) + rew_pending(mdoc, n); return; } - if (maxargs && endbody == NULL) { - if (n == NULL) { - /* - * Stray .Ec without previous .Eo: - * Break the output line, ignore any arguments. - */ - mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); - rew_elem(mdoc, MDOC_br); - } else - mdoc_tail_alloc(mdoc, line, ppos, atok); - } - - flushed = n == NULL; + if (endbody != NULL) + n = endbody; for (j = 0; ; j++) { lastarg = *pos; - if (j == maxargs && ! flushed) { - if (endbody == NULL) - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); - else - rew_last(mdoc, endbody); - flushed = 1; + if (j == maxargs && n != NULL) { + rew_pending(mdoc, n); + n = NULL; } ac = mdoc_args(mdoc, line, pos, buf, tok, &p); @@ -867,24 +852,17 @@ blk_exp_close(MACRO_PROT_ARGS) continue; } - if ( ! flushed) { - if (endbody == NULL) - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); - else - rew_last(mdoc, endbody); - flushed = 1; + if (n != NULL) { + rew_pending(mdoc, n); + n = NULL; } mdoc->flags &= ~MDOC_NEWLINE; mdoc_macro(mdoc, ntok, line, lastarg, pos, buf); break; } - if ( ! flushed) { - if (endbody == NULL) - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); - else - rew_last(mdoc, endbody); - } + if (n != NULL) + rew_pending(mdoc, n); if (nl) append_delims(mdoc, line, pos, buf); } @@ -1077,8 +1055,9 @@ blk_full(MACRO_PROT_ARGS) { int la, nl, parsed; struct mdoc_arg *arg; - struct mdoc_node *head; /* save of head macro */ - struct mdoc_node *body; /* save of body macro */ + struct mdoc_node *blk; /* Our own block. */ + struct mdoc_node *head; /* Our own head. */ + struct mdoc_node *body; /* Our own body. */ struct mdoc_node *n; enum margserr ac, lac; char *p; @@ -1118,7 +1097,7 @@ blk_full(MACRO_PROT_ARGS) */ mdoc_argv(mdoc, line, tok, &arg, pos, buf); - mdoc_block_alloc(mdoc, line, ppos, tok, arg); + blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg); head = body = NULL; /* @@ -1137,7 +1116,7 @@ blk_full(MACRO_PROT_ARGS) if (tok == MDOC_Nd) { head = mdoc_head_alloc(mdoc, line, ppos, tok); - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + rew_last(mdoc, head); body = mdoc_body_alloc(mdoc, line, ppos, tok); } @@ -1161,7 +1140,8 @@ blk_full(MACRO_PROT_ARGS) * reopen our scope if the last parse was a * phrase or partial phrase. */ - rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + if (body != NULL) + rew_last(mdoc, body); body = mdoc_body_alloc(mdoc, line, ppos, tok); break; } @@ -1195,8 +1175,7 @@ blk_full(MACRO_PROT_ARGS) * head; if we have, rewind that instead. */ - rew_sub(body ? MDOC_BODY : MDOC_HEAD, - mdoc, tok, line, ppos); + rew_last(mdoc, body == NULL ? head : body); body = mdoc_body_alloc(mdoc, line, ppos, tok); /* @@ -1218,6 +1197,8 @@ blk_full(MACRO_PROT_ARGS) break; } + if (blk->flags & MDOC_VALID) + return; if (head == NULL) head = mdoc_head_alloc(mdoc, line, ppos, tok); if (nl) @@ -1228,7 +1209,7 @@ blk_full(MACRO_PROT_ARGS) /* * If there is an open (i.e., unvalidated) sub-block requiring * explicit close-out, postpone switching the current block from - * head to body until the rew_sub() call closing out that + * head to body until the rew_pending() call closing out that * sub-block. */ for (n = mdoc->last; n && n != head; n = n->parent) { @@ -1242,12 +1223,12 @@ blk_full(MACRO_PROT_ARGS) /* Close out scopes to remain in a consistent state. */ - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); - mdoc_body_alloc(mdoc, line, ppos, tok); + rew_last(mdoc, head); + body = mdoc_body_alloc(mdoc, line, ppos, tok); out: if (mdoc->flags & MDOC_FREECOL) { - rew_sub(MDOC_BODY, mdoc, tok, line, ppos); - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + rew_last(mdoc, body); + rew_last(mdoc, blk); mdoc->flags &= ~MDOC_FREECOL; } } @@ -1274,8 +1255,7 @@ blk_part_imp(MACRO_PROT_ARGS) */ blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL); - mdoc_head_alloc(mdoc, line, ppos, tok); - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + rew_last(mdoc, mdoc_head_alloc(mdoc, line, ppos, tok)); /* * Open the body scope "on-demand", that is, after we've @@ -1306,8 +1286,8 @@ blk_part_imp(MACRO_PROT_ARGS) /* * If there is an open sub-block requiring explicit close-out, - * postpone closing out the current block - * until the rew_sub() call closing out the sub-block. + * postpone closing out the current block until the + * rew_pending() call closing out the sub-block. */ for (n = mdoc->last; n && n != body && n != blk->parent; @@ -1322,10 +1302,10 @@ blk_part_imp(MACRO_PROT_ARGS) } } assert(n == body); - rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + rew_last(mdoc, body); if (nl) append_delims(mdoc, line, pos, buf); - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + rew_pending(mdoc, blk); /* Move trailing .Ns out of scope. */ @@ -1341,7 +1321,6 @@ blk_part_exp(MACRO_PROT_ARGS) int la, nl; enum margserr ac; struct mdoc_node *head; /* keep track of head */ - struct mdoc_node *body; /* keep track of body */ char *p; nl = MDOC_NEWLINE & mdoc->flags; @@ -1353,7 +1332,8 @@ blk_part_exp(MACRO_PROT_ARGS) */ mdoc_block_alloc(mdoc, line, ppos, tok, NULL); - for (head = body = NULL; ; ) { + head = NULL; + for (;;) { la = *pos; ac = mdoc_args(mdoc, line, pos, buf, tok, &p); if (ac == ARGS_PUNCT || ac == ARGS_EOLN) @@ -1363,32 +1343,19 @@ blk_part_exp(MACRO_PROT_ARGS) if (head == NULL && ac != ARGS_QWORD && mdoc_isdelim(p) == DELIM_OPEN) { - assert(NULL == body); dword(mdoc, line, la, p, DELIM_OPEN, 0); continue; } if (head == NULL) { - assert(body == NULL); head = mdoc_head_alloc(mdoc, line, ppos, tok); - } - - /* - * `Eo' gobbles any data into the head, but most other - * macros just immediately close out and begin the body. - */ - - if (body == NULL) { - assert(head); - /* No check whether it's a macro! */ - if (tok == MDOC_Eo) + if (tok == MDOC_Eo) /* Not parsed. */ dword(mdoc, line, la, p, DELIM_MAX, 0); - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); - body = mdoc_body_alloc(mdoc, line, ppos, tok); + rew_last(mdoc, head); + mdoc_body_alloc(mdoc, line, ppos, tok); if (tok == MDOC_Eo) continue; } - assert(head != NULL && body != NULL); if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) break; @@ -1396,11 +1363,8 @@ blk_part_exp(MACRO_PROT_ARGS) /* Clean-up to leave in a consistent state. */ - if (head == NULL) - mdoc_head_alloc(mdoc, line, ppos, tok); - - if (body == NULL) { - rew_sub(MDOC_HEAD, mdoc, tok, line, ppos); + if (head == NULL) { + rew_last(mdoc, mdoc_head_alloc(mdoc, line, ppos, tok)); mdoc_body_alloc(mdoc, line, ppos, tok); } if (nl) @@ -1565,14 +1529,20 @@ ctx_synopsis(MACRO_PROT_ARGS) static void phrase_ta(MACRO_PROT_ARGS) { - struct mdoc_node *n; + struct mdoc_node *body, *n; /* Make sure we are in a column list or ignore this macro. */ - n = mdoc->last; - while (n != NULL && - (n->tok != MDOC_Bl || n->flags & (MDOC_VALID | MDOC_BREAK))) - n = n->parent; + body = NULL; + for (n = mdoc->last; n != NULL; n = n->parent) { + if (n->flags & (MDOC_VALID | MDOC_BREAK)) + continue; + if (n->tok == MDOC_It && n->type == MDOC_BODY) + body = n; + if (n->tok == MDOC_Bl) + break; + } + if (n == NULL || n->norm->Bl.type != LIST_column) { mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse, line, ppos, "Ta"); @@ -1581,7 +1551,7 @@ phrase_ta(MACRO_PROT_ARGS) /* Advance to the next column. */ - rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); + rew_last(mdoc, body); mdoc_body_alloc(mdoc, line, ppos, MDOC_It); parse_rest(mdoc, MDOC_MAX, line, pos, buf); }