=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.239 retrieving revision 1.246 diff -u -p -r1.239 -r1.246 --- mandoc/mdoc.c 2015/04/02 21:36:50 1.239 +++ mandoc/mdoc.c 2015/04/18 17:53:21 1.246 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.239 2015/04/02 21:36:50 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.246 2015/04/18 17:53:21 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012-2015 Ingo Schwarze @@ -7,9 +7,9 @@ * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF @@ -83,143 +83,45 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { const char * const *mdoc_macronames = __mdoc_macronames; const char * const *mdoc_argnames = __mdoc_argnames; -static void mdoc_node_free(struct mdoc_node *); -static void mdoc_node_unlink(struct mdoc *, - struct mdoc_node *); -static void mdoc_free1(struct mdoc *); -static void mdoc_alloc1(struct mdoc *); -static struct mdoc_node *node_alloc(struct mdoc *, int, int, - enum mdoct, enum roff_type); -static void node_append(struct mdoc *, struct mdoc_node *); -static int mdoc_ptext(struct mdoc *, int, char *, int); -static int mdoc_pmacro(struct mdoc *, int, char *, int); +static void mdoc_node_free(struct roff_node *); +static void mdoc_node_unlink(struct roff_man *, + struct roff_node *); +static struct roff_node *node_alloc(struct roff_man *, int, int, + int, enum roff_type); +static void node_append(struct roff_man *, struct roff_node *); +static int mdoc_ptext(struct roff_man *, int, char *, int); +static int mdoc_pmacro(struct roff_man *, int, char *, int); -const struct mdoc_node * -mdoc_node(const struct mdoc *mdoc) -{ - - return(mdoc->first); -} - -const struct mdoc_meta * -mdoc_meta(const struct mdoc *mdoc) -{ - - return(&mdoc->meta); -} - -/* - * Frees volatile resources (parse tree, meta-data, fields). - */ -static void -mdoc_free1(struct mdoc *mdoc) -{ - - if (mdoc->first) - mdoc_node_delete(mdoc, mdoc->first); - free(mdoc->meta.msec); - free(mdoc->meta.vol); - free(mdoc->meta.arch); - free(mdoc->meta.date); - free(mdoc->meta.title); - free(mdoc->meta.os); - free(mdoc->meta.name); -} - -/* - * Allocate all volatile resources (parse tree, meta-data, fields). - */ -static void -mdoc_alloc1(struct mdoc *mdoc) -{ - - memset(&mdoc->meta, 0, sizeof(struct mdoc_meta)); - mdoc->flags = 0; - mdoc->lastnamed = mdoc->lastsec = SEC_NONE; - mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node)); - mdoc->first = mdoc->last; - mdoc->last->type = ROFFT_ROOT; - mdoc->last->tok = MDOC_MAX; - mdoc->next = MDOC_NEXT_CHILD; -} - -/* - * Free up volatile resources (see mdoc_free1()) then re-initialises the - * data with mdoc_alloc1(). After invocation, parse data has been reset - * and the parser is ready for re-invocation on a new tree; however, - * cross-parse non-volatile data is kept intact. - */ void -mdoc_reset(struct mdoc *mdoc) +mdoc_endparse(struct roff_man *mdoc) { - mdoc_free1(mdoc); - mdoc_alloc1(mdoc); -} - -/* - * Completely free up all volatile and non-volatile parse resources. - * After invocation, the pointer is no longer usable. - */ -void -mdoc_free(struct mdoc *mdoc) -{ - - mdoc_free1(mdoc); - free(mdoc); -} - -/* - * Allocate volatile and non-volatile parse resources. - */ -struct mdoc * -mdoc_alloc(struct roff *roff, struct mparse *parse, - const char *defos, int quick) -{ - struct mdoc *p; - - p = mandoc_calloc(1, sizeof(struct mdoc)); - - p->parse = parse; - p->defos = defos; - p->quick = quick; - p->roff = roff; - - mdoc_hash_init(); - mdoc_alloc1(p); - return(p); -} - -void -mdoc_endparse(struct mdoc *mdoc) -{ - mdoc_macroend(mdoc); } void -mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) +mdoc_addeqn(struct roff_man *mdoc, const struct eqn *ep) { - struct mdoc_node *n; + struct roff_node *n; n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, ROFFT_EQN); n->eqn = ep; if (ep->ln > mdoc->last->line) n->flags |= MDOC_LINE; node_append(mdoc, n); - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } void -mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) +mdoc_addspan(struct roff_man *mdoc, const struct tbl_span *sp) { - struct mdoc_node *n; + struct roff_node *n; n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, ROFFT_TBL); n->span = sp; node_append(mdoc, n); - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } /* @@ -227,7 +129,7 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int -mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) +mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs) { if (mdoc->last->type != ROFFT_EQN || ln > mdoc->last->line) @@ -277,7 +179,7 @@ mdoc_macro(MACRO_PROT_ARGS) static void -node_append(struct mdoc *mdoc, struct mdoc_node *p) +node_append(struct roff_man *mdoc, struct roff_node *p) { assert(mdoc->last); @@ -285,12 +187,12 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) assert(p->type != ROFFT_ROOT); switch (mdoc->next) { - case MDOC_NEXT_SIBLING: + case ROFF_NEXT_SIBLING: mdoc->last->next = p; p->prev = mdoc->last; p->parent = mdoc->last->parent; break; - case MDOC_NEXT_CHILD: + case ROFF_NEXT_CHILD: mdoc->last->child = p; p->parent = mdoc->last; break; @@ -354,13 +256,13 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) } } -static struct mdoc_node * -node_alloc(struct mdoc *mdoc, int line, int pos, - enum mdoct tok, enum roff_type type) +static struct roff_node * +node_alloc(struct roff_man *mdoc, int line, int pos, + int tok, enum roff_type type) { - struct mdoc_node *p; + struct roff_node *p; - p = mandoc_calloc(1, sizeof(struct mdoc_node)); + p = mandoc_calloc(1, sizeof(*p)); p->sec = mdoc->lastsec; p->line = line; p->pos = pos; @@ -381,44 +283,44 @@ node_alloc(struct mdoc *mdoc, int line, int pos, } void -mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) +mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - struct mdoc_node *p; + struct roff_node *p; p = node_alloc(mdoc, line, pos, tok, ROFFT_TAIL); node_append(mdoc, p); - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; } -struct mdoc_node * -mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) +struct roff_node * +mdoc_head_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - struct mdoc_node *p; + struct roff_node *p; assert(mdoc->first); assert(mdoc->last); p = node_alloc(mdoc, line, pos, tok, ROFFT_HEAD); node_append(mdoc, p); - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; return(p); } -struct mdoc_node * -mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) +struct roff_node * +mdoc_body_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - struct mdoc_node *p; + struct roff_node *p; p = node_alloc(mdoc, line, pos, tok, ROFFT_BODY); node_append(mdoc, p); - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; return(p); } -struct mdoc_node * -mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, - struct mdoc_node *body, enum mdoc_endbody end) +struct roff_node * +mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok, + struct roff_node *body, enum mdoc_endbody end) { - struct mdoc_node *p; + struct roff_node *p; body->flags |= MDOC_ENDED; body->parent->flags |= MDOC_ENDED; @@ -427,15 +329,15 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po p->norm = body->norm; p->end = end; node_append(mdoc, p); - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; return(p); } -struct mdoc_node * -mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, - enum mdoct tok, struct mdoc_arg *args) +struct roff_node * +mdoc_block_alloc(struct roff_man *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { - struct mdoc_node *p; + struct roff_node *p; p = node_alloc(mdoc, line, pos, tok, ROFFT_BLOCK); p->args = args; @@ -458,15 +360,15 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, break; } node_append(mdoc, p); - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; return(p); } void -mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, - enum mdoct tok, struct mdoc_arg *args) +mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { - struct mdoc_node *p; + struct roff_node *p; p = node_alloc(mdoc, line, pos, tok, ROFFT_ELEM); p->args = args; @@ -481,24 +383,24 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, break; } node_append(mdoc, p); - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; } void -mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) +mdoc_word_alloc(struct roff_man *mdoc, int line, int pos, const char *p) { - struct mdoc_node *n; + struct roff_node *n; n = node_alloc(mdoc, line, pos, MDOC_MAX, ROFFT_TEXT); n->string = roff_strdup(mdoc->roff, p); node_append(mdoc, n); - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } void -mdoc_word_append(struct mdoc *mdoc, const char *p) +mdoc_word_append(struct roff_man *mdoc, const char *p) { - struct mdoc_node *n; + struct roff_node *n; char *addstr, *newstr; n = mdoc->last; @@ -507,11 +409,11 @@ mdoc_word_append(struct mdoc *mdoc, const char *p) free(addstr); free(n->string); n->string = newstr; - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } static void -mdoc_node_free(struct mdoc_node *p) +mdoc_node_free(struct roff_node *p) { if (p->type == ROFFT_BLOCK || p->type == ROFFT_ELEM) @@ -524,7 +426,7 @@ mdoc_node_free(struct mdoc_node *p) } static void -mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n) +mdoc_node_unlink(struct roff_man *mdoc, struct roff_node *n) { /* Adjust siblings. */ @@ -549,10 +451,10 @@ mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node * if (mdoc && mdoc->last == n) { if (n->prev) { mdoc->last = n->prev; - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } else { mdoc->last = n->parent; - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; } } @@ -561,7 +463,7 @@ mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node * } void -mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) +mdoc_node_delete(struct roff_man *mdoc, struct roff_node *p) { while (p->child) { @@ -575,7 +477,7 @@ mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node * } void -mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) +mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p) { mdoc_node_unlink(mdoc, p); @@ -587,10 +489,10 @@ mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node * * control character. */ static int -mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) +mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs) { + struct roff_node *n; char *c, *ws, *end; - struct mdoc_node *n; assert(mdoc->last); n = mdoc->last; @@ -675,7 +577,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int * behaviour that we want to work around it. */ mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL); - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; mdoc_valid_post(mdoc); return(1); } @@ -703,11 +605,11 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int * character. */ static int -mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) +mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs) { - struct mdoc_node *n; + struct roff_node *n; const char *cp; - enum mdoct tok; + int tok; int i, sv; char mac[5]; @@ -861,7 +763,7 @@ mdoc_isdelim(const char *p) } void -mdoc_deroff(char **dest, const struct mdoc_node *n) +mdoc_deroff(char **dest, const struct roff_node *n) { char *cp; size_t sz;