=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.61 retrieving revision 1.70 diff -u -p -r1.61 -r1.70 --- mandoc/mdoc.c 2009/03/11 00:39:58 1.61 +++ mandoc/mdoc.c 2009/03/23 14:22:11 1.70 @@ -1,6 +1,6 @@ -/* $Id: mdoc.c,v 1.61 2009/03/11 00:39:58 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.70 2009/03/23 14:22:11 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -24,14 +24,15 @@ #include #include -#include "private.h" +#include "libmdoc.h" /* * Main caller in the libmdoc library. This begins the parsing routine, * handles allocation of data, and so forth. Most of the "work" is done - * in macro.c and validate.c. + * in macro.c, validate.c and action.c. */ +/* FIXME: have this accept line/pos/tok. */ static struct mdoc_node *mdoc_node_alloc(const struct mdoc *); static int mdoc_node_append(struct mdoc *, struct mdoc_node *); @@ -73,7 +74,10 @@ const char *const __mdoc_macronames[MDOC_MAX] = { "Bk", "Ek", "Bt", "Hf", "Fr", "Ud", "Lb", "Ap", "Lp", "Lk", "Mt", "Brq", - "Bro", "Brc" + /* LINTED */ + "Bro", "Brc", "\%C", "Es", + /* LINTED */ + "En", "Dx", "\%Q" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { @@ -85,17 +89,24 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { "ohang", "inset", "column", "width", "compact", "std", "filled", "words", "emphasis", - "symbolic" + "symbolic", "nested" }; const char * const *mdoc_macronames = __mdoc_macronames; const char * const *mdoc_argnames = __mdoc_argnames; +/* + * Get the first (root) node of the parse tree. + */ const struct mdoc_node * mdoc_node(const struct mdoc *mdoc) { + if (MDOC_HALT & mdoc->flags) + return(NULL); + if (mdoc->first) + assert(MDOC_ROOT == mdoc->first->type); return(mdoc->first); } @@ -104,18 +115,55 @@ const struct mdoc_meta * mdoc_meta(const struct mdoc *mdoc) { + if (MDOC_HALT & mdoc->flags) + return(NULL); return(&mdoc->meta); } +/* + * Free up all resources contributed by a parse: the node tree, + * meta-data and so on. Then reallocate the root node for another + * parse. + */ void +mdoc_reset(struct mdoc *mdoc) +{ + + if (mdoc->first) + mdoc_node_freelist(mdoc->first); + if (mdoc->meta.title) + free(mdoc->meta.title); + if (mdoc->meta.os) + free(mdoc->meta.os); + if (mdoc->meta.name) + free(mdoc->meta.name); + if (mdoc->meta.arch) + free(mdoc->meta.arch); + if (mdoc->meta.vol) + free(mdoc->meta.vol); + + bzero(&mdoc->meta, sizeof(struct mdoc_meta)); + mdoc->flags = 0; + mdoc->lastnamed = mdoc->lastsec = 0; + mdoc->last = calloc(1, sizeof(struct mdoc_node)); + if (NULL == mdoc->last) + err(1, "calloc"); + mdoc->first = mdoc->last; + mdoc->last->type = MDOC_ROOT; + mdoc->next = MDOC_NEXT_CHILD; +} + + +/* + * Completely free up all resources. + */ +void mdoc_free(struct mdoc *mdoc) { if (mdoc->first) mdoc_node_freelist(mdoc->first); - if (mdoc->htab) - mdoc_tokhash_free(mdoc->htab); if (mdoc->meta.title) free(mdoc->meta.title); if (mdoc->meta.os) @@ -127,6 +175,9 @@ mdoc_free(struct mdoc *mdoc) if (mdoc->meta.vol) free(mdoc->meta.vol); + if (mdoc->htab) + mdoc_tokhash_free(mdoc->htab); + free(mdoc); } @@ -136,23 +187,28 @@ mdoc_alloc(void *data, int pflags, const struct mdoc_c { struct mdoc *p; - p = xcalloc(1, sizeof(struct mdoc)); + if (NULL == (p = calloc(1, sizeof(struct mdoc)))) + err(1, "calloc"); p->data = data; if (cb) (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - p->last = xcalloc(1, sizeof(struct mdoc_node)); + if (NULL == (p->first = calloc(1, sizeof(struct mdoc_node)))) + err(1, "calloc"); + p->last = p->first; p->last->type = MDOC_ROOT; - p->first = p->last; p->pflags = pflags; p->next = MDOC_NEXT_CHILD; p->htab = mdoc_tokhash_alloc(); - return(p); } +/* + * Climb back up the parse tree, validating open scopes. Mostly calls + * through to macro_end in macro.c. + */ int mdoc_endparse(struct mdoc *mdoc) { @@ -257,7 +313,8 @@ mdoc_macro(struct mdoc *m, int tok, "disallowed in prologue")); if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) - return(mdoc_perr(m, ln, pp, "not callable")); + return(mdoc_perr(m, ln, pp, "%s not callable", + mdoc_macronames[tok])); return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf)); } @@ -288,6 +345,8 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * if ( ! mdoc_valid_pre(mdoc, p)) return(0); + if ( ! mdoc_action_pre(mdoc, p)) + return(0); switch (p->type) { case (MDOC_HEAD): @@ -316,7 +375,8 @@ mdoc_node_alloc(const struct mdoc *mdoc) { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + if (NULL == (p = calloc(1, sizeof(struct mdoc_node)))) + err(1, "calloc"); p->sec = mdoc->lastsec; return(p); @@ -381,19 +441,6 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int -mdoc_root_alloc(struct mdoc *mdoc) -{ - struct mdoc_node *p; - - p = mdoc_node_alloc(mdoc); - - p->type = MDOC_ROOT; - - return(mdoc_node_append(mdoc, p)); -} - - -int mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, int tok, struct mdoc_arg *args) { @@ -446,7 +493,8 @@ mdoc_word_alloc(struct mdoc *mdoc, p->line = line; p->pos = pos; p->type = MDOC_TEXT; - p->string = xstrdup(word); + if (NULL == (p->string = strdup(word))) + err(1, "strdup"); return(mdoc_node_append(mdoc, p)); } @@ -482,17 +530,21 @@ mdoc_node_freelist(struct mdoc_node *p) * control character. */ static int -parsetext(struct mdoc *mdoc, int line, char *buf) +parsetext(struct mdoc *m, int line, char *buf) { - if (SEC_PROLOGUE == mdoc->lastnamed) - return(mdoc_perr(mdoc, line, 0, + if (SEC_PROLOGUE == m->lastnamed) + return(mdoc_perr(m, line, 0, "text disallowed in prologue")); - if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) + if (0 == buf[0] && ! (MDOC_LITERAL & m->flags)) + return(mdoc_perr(m, line, 0, + "blank lines only in literal context")); + + if ( ! mdoc_word_alloc(m, line, 0, buf)) return(0); - mdoc->next = MDOC_NEXT_SIBLING; + m->next = MDOC_NEXT_SIBLING; return(1); } @@ -520,8 +572,20 @@ parsemacro(struct mdoc *m, int ln, char *buf) int i, c; char mac[5]; - /* Comments are quickly ignored. */ + /* Comments and empties are quickly ignored. */ + if (0 == buf[1]) + return(1); + + if (' ' == buf[1]) { + i = 2; + while (buf[i] && ' ' == buf[i]) + i++; + if (0 == buf[i]) + return(1); + return(mdoc_perr(m, ln, 1, "invalid syntax")); + } + if (buf[1] && '\\' == buf[1]) if (buf[2] && '\"' == buf[2]) return(1); @@ -531,12 +595,10 @@ parsemacro(struct mdoc *m, int ln, char *buf) for (i = 1; i < 5; i++) { if (0 == (mac[i - 1] = buf[i])) break; - else if (isspace((unsigned char)buf[i])) + else if (' ' == buf[i]) break; } - /* FIXME: be able to skip unknown macro lines! */ - mac[i - 1] = 0; if (i == 5 || i <= 2) { @@ -553,7 +615,7 @@ parsemacro(struct mdoc *m, int ln, char *buf) /* The macro is sane. Jump to the next word. */ - while (buf[i] && isspace((unsigned char)buf[i])) + while (buf[i] && ' ' == buf[i]) i++; /* Begin recursive parse sequence. */