=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.278 retrieving revision 1.287 diff -u -p -r1.278 -r1.287 --- mandoc/roff.c 2015/10/12 00:08:16 1.278 +++ mandoc/roff.c 2017/01/10 21:59:47 1.287 @@ -1,7 +1,7 @@ -/* $Id: roff.c,v 1.278 2015/10/12 00:08:16 schwarze Exp $ */ +/* $Id: roff.c,v 1.287 2017/01/10 21:59:47 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons - * Copyright (c) 2010-2015 Ingo Schwarze + * Copyright (c) 2010-2015, 2017 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 @@ -33,9 +33,6 @@ #include "roff_int.h" #include "libroff.h" -/* Maximum number of nested if-else conditionals. */ -#define RSTACK_MAX 128 - /* Maximum number of string expansions per line, to break infinite loops. */ #define EXPAND_LIMIT 1000 @@ -316,7 +313,6 @@ struct roffreg { struct roff { struct mparse *parse; /* parse point */ - const struct mchars *mchars; /* character table */ struct roffnode *last; /* leaf of stack */ int *rstack; /* stack of inverted `ie' values */ struct roffreg *regtab; /* number registers */ @@ -901,13 +897,12 @@ roff_free(struct roff *r) } struct roff * -roff_alloc(struct mparse *parse, const struct mchars *mchars, int options) +roff_alloc(struct mparse *parse, int options) { struct roff *r; r = mandoc_calloc(1, sizeof(struct roff)); r->parse = parse; - r->mchars = mchars; r->options = options; r->format = options & (MPARSE_MDOC | MPARSE_MAN); r->rstackpos = -1; @@ -996,11 +991,11 @@ roff_node_alloc(struct roff_man *man, int line, int po n->sec = man->lastsec; if (man->flags & MDOC_SYNOPSIS) - n->flags |= MDOC_SYNPRETTY; + n->flags |= NODE_SYNPRETTY; else - n->flags &= ~MDOC_SYNPRETTY; + n->flags &= ~NODE_SYNPRETTY; if (man->flags & MDOC_NEWLINE) - n->flags |= MDOC_LINE; + n->flags |= NODE_LINE; man->flags &= ~MDOC_NEWLINE; return n; @@ -1012,60 +1007,52 @@ roff_node_append(struct roff_man *man, struct roff_nod switch (man->next) { case ROFF_NEXT_SIBLING: + if (man->last->next != NULL) { + n->next = man->last->next; + man->last->next->prev = n; + } else + man->last->parent->last = n; man->last->next = n; n->prev = man->last; n->parent = man->last->parent; break; case ROFF_NEXT_CHILD: + if (man->last->child != NULL) { + n->next = man->last->child; + man->last->child->prev = n; + } else + man->last->last = n; man->last->child = n; n->parent = man->last; break; default: abort(); } - n->parent->nchild++; - n->parent->last = n; + man->last = n; - /* - * Copy over the normalised-data pointer of our parent. Not - * everybody has one, but copying a null pointer is fine. - */ - switch (n->type) { - case ROFFT_BODY: - if (n->end != ENDBODY_NOT) - break; - /* FALLTHROUGH */ - case ROFFT_TAIL: case ROFFT_HEAD: - n->norm = n->parent->norm; - break; - default: - break; - } - - if (man->macroset == MACROSET_MDOC) - mdoc_valid_pre(man, n); - - switch (n->type) { - case ROFFT_HEAD: - assert(n->parent->type == ROFFT_BLOCK); n->parent->head = n; break; case ROFFT_BODY: - if (n->end) - break; - assert(n->parent->type == ROFFT_BLOCK); + if (n->end != ENDBODY_NOT) + return; n->parent->body = n; break; case ROFFT_TAIL: - assert(n->parent->type == ROFFT_BLOCK); n->parent->tail = n; break; default: - break; + return; } - man->last = n; + + /* + * Copy over the normalised-data pointer of our parent. Not + * everybody has one, but copying a null pointer is fine. + */ + + n->norm = n->parent->norm; + assert(n->parent->type == ROFFT_BLOCK); } void @@ -1076,10 +1063,7 @@ roff_word_alloc(struct roff_man *man, int line, int po n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE); n->string = roff_strdup(man->roff, word); roff_node_append(man, n); - if (man->macroset == MACROSET_MDOC) - mdoc_valid_post(man); - else - man_valid_post(man); + n->flags |= NODE_VALID | NODE_ENDED; man->next = ROFF_NEXT_SIBLING; } @@ -1149,7 +1133,7 @@ roff_addeqn(struct roff_man *man, const struct eqn *eq n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE); n->eqn = eqn; if (eqn->ln > man->last->line) - n->flags |= MDOC_LINE; + n->flags |= NODE_LINE; roff_node_append(man, n); man->next = ROFF_NEXT_SIBLING; } @@ -1164,10 +1148,7 @@ roff_addtbl(struct roff_man *man, const struct tbl_spa n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); n->span = tbl; roff_node_append(man, n); - if (man->macroset == MACROSET_MDOC) - mdoc_valid_post(man); - else - man_valid_post(man); + n->flags |= NODE_VALID | NODE_ENDED; man->next = ROFF_NEXT_SIBLING; } @@ -1185,7 +1166,6 @@ roff_node_unlink(struct roff_man *man, struct roff_nod /* Adjust parent. */ if (n->parent != NULL) { - n->parent->nchild--; if (n->parent->child == n) n->parent->child = n->next; if (n->parent->last == n) @@ -1227,7 +1207,6 @@ roff_node_delete(struct roff_man *man, struct roff_nod while (n->child != NULL) roff_node_delete(man, n->child); - assert(n->nchild == 0); roff_node_unlink(man, n); roff_node_free(n); } @@ -1344,7 +1323,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int esc = mandoc_escape(&cp, &stnam, &inaml); if (esc == ESCAPE_ERROR || (esc == ESCAPE_SPECIAL && - mchars_spec2cp(r->mchars, stnam, inaml) < 0)) + mchars_spec2cp(stnam, inaml) < 0)) mandoc_vmsg(MANDOCERR_ESC_BAD, r->parse, ln, (int)(stesc - buf->buf), "%.*s", (int)(cp - stesc), stesc);