=================================================================== RCS file: /cvs/mandoc/Attic/action.c,v retrieving revision 1.11 retrieving revision 1.20 diff -u -p -r1.11 -r1.20 --- mandoc/Attic/action.c 2009/01/17 16:47:02 1.11 +++ mandoc/Attic/action.c 2009/02/26 16:08:11 1.20 @@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.11 2009/01/17 16:47:02 kristaps Exp $ */ +/* $Id: action.c,v 1.20 2009/02/26 16:08:11 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -17,11 +17,18 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include +#include #include #include "private.h" +/* + * Actions are executed on macros after they've been post-validated: in + * other words, a macro will not be "acted upon" until all of its + * children have been filled in (post-fix order). + */ struct actions { int (*post)(struct mdoc *); @@ -29,12 +36,15 @@ struct actions { /* Per-macro action routines. */ -static int post_sh(struct mdoc *); -static int post_os(struct mdoc *); -static int post_dt(struct mdoc *); -static int post_dd(struct mdoc *); -static int post_nm(struct mdoc *); +static int post_bl(struct mdoc *); +static int post_sh(struct mdoc *); +static int post_os(struct mdoc *); +static int post_dt(struct mdoc *); +static int post_dd(struct mdoc *); +static int post_nm(struct mdoc *); +static int post_prologue(struct mdoc *); + /* Array of macro action routines. */ const struct actions mdoc_actions[MDOC_MAX] = { @@ -49,7 +59,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* Dl */ { NULL }, /* Bd */ { NULL }, /* Ed */ - { NULL }, /* Bl */ + { post_bl }, /* Bl */ { NULL }, /* El */ { NULL }, /* It */ { NULL }, /* Ad */ @@ -147,6 +157,11 @@ const struct actions mdoc_actions[MDOC_MAX] = { }; +/* + * The `Nm' macro sets the document's name when used the first time with + * an argument. Subsequent calls without a value will result in the + * name value being used. + */ static int post_nm(struct mdoc *mdoc) { @@ -167,6 +182,10 @@ post_nm(struct mdoc *mdoc) } +/* + * We keep track of the current section in order to provide warnings on + * section ordering, per-section macros, and so on. + */ static int post_sh(struct mdoc *mdoc) { @@ -177,8 +196,8 @@ post_sh(struct mdoc *mdoc) return(1); if (xstrlcats(buf, mdoc->last->child, 64)) { if (SEC_CUSTOM != (sec = mdoc_atosec(buf))) - mdoc->sec_lastn = sec; - mdoc->sec_last = sec; + mdoc->lastnamed = sec; + mdoc->lastsec = sec; return(1); } @@ -186,6 +205,9 @@ post_sh(struct mdoc *mdoc) } +/* + * Prologue title must be parsed into document meta-data. + */ static int post_dt(struct mdoc *mdoc) { @@ -198,6 +220,7 @@ post_dt(struct mdoc *mdoc) assert(NULL == mdoc->meta.title); + /* LINTED */ for (i = 0, n = mdoc->last->child; n; n = n->next, i++) { assert(MDOC_TEXT == n->type); p = n->data.text.string; @@ -225,11 +248,17 @@ post_dt(struct mdoc *mdoc) } if (NULL == mdoc->meta.title) - mdoc->meta.title = xstrdup("untitled"); - return(1); + mdoc->meta.title = xstrdup("UNTITLED"); + + mdoc_msg(mdoc, "title: %s", mdoc->meta.title); + + return(post_prologue(mdoc)); } +/* + * Prologue operating system must be parsed into document meta-data. + */ static int post_os(struct mdoc *mdoc) { @@ -243,60 +272,119 @@ post_os(struct mdoc *mdoc) return(mdoc_err(mdoc, "macro parameters too long")); mdoc->meta.os = xstrdup(buf[0] ? buf : "local"); - mdoc->sec_lastn = mdoc->sec_last = SEC_BODY; + mdoc->lastnamed = SEC_BODY; + + return(post_prologue(mdoc)); +} + + +/* + * Transform -width MACRO values into real widths. + */ +static int +post_bl(struct mdoc *mdoc) +{ + struct mdoc_block *bl; + size_t i, width; + int tok; + char buf[32]; + + if (MDOC_BLOCK != mdoc->last->type) + return(1); + + bl = &mdoc->last->data.block; + + for (i = 0; i < bl->argc; i++) + if (MDOC_Width == bl->argv[i].arg) + break; + + if (i == bl->argc) + return(1); + + assert(1 == bl->argv[i].sz); + if (MDOC_MAX == (tok = mdoc_find(mdoc, *bl->argv[i].value))) + return(1); + + if (0 == (width = mdoc_macro2len(tok))) + return(mdoc_warn(mdoc, WARN_SYNTAX, + "-%s macro has no length", + mdoc_argnames[MDOC_Width])); + + mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", + mdoc_argnames[MDOC_Width], + *bl->argv[i].value, width); + + /* FIXME: silently truncates. */ + (void)snprintf(buf, sizeof(buf), "%zun", width); + + free(*bl->argv[i].value); + *bl->argv[i].value = strdup(buf); + return(1); } +/* + * Prologue date must be parsed into document meta-data. + */ static int post_dd(struct mdoc *mdoc) { - char date[64]; - size_t sz; - char *p; - struct mdoc_node *n; + char buf[64]; assert(MDOC_ELEM == mdoc->last->type); assert(MDOC_Dd == mdoc->last->tok); - n = mdoc->last->child; assert(0 == mdoc->meta.date); - date[0] = 0; - sz = 64; + if ( ! xstrlcats(buf, mdoc->last->child, 64)) + return(mdoc_err(mdoc, "macro parameters too long")); + if (0 == (mdoc->meta.date = mdoc_atotime(buf))) + return(mdoc_err(mdoc, "invalid parameter syntax")); - for ( ; 0 == mdoc->meta.date && n; n = n->next) { - assert(MDOC_TEXT == n->type); - p = n->data.text.string; + mdoc_msg(mdoc, "date: %u", mdoc->meta.date); - if (xstrcmp(p, "$Mdocdate: January 17 2009 $")) { - mdoc->meta.date = time(NULL); - continue; - } else if (xstrcmp(p, "$")) { - mdoc->meta.date = mdoc_atotime(date); - continue; - } else if (xstrcmp(p, "$Mdocdate:")) - continue; + return(post_prologue(mdoc)); +} - if ( ! xstrlcat(date, n->data.text.string, sz)) - return(mdoc_nerr(mdoc, n, "invalid parameter syntax")); - if (n->next && ! xstrlcat(date, " ", sz)) - return(mdoc_nerr(mdoc, n, "invalid parameter syntax")); + +/* + * The end document shouldn't have the prologue macros as part of the + * syntax tree (they encompass only meta-data). + */ +static int +post_prologue(struct mdoc *mdoc) +{ + struct mdoc_node *n; + + if (mdoc->last->parent->child == mdoc->last) + mdoc->last->parent->child = mdoc->last->prev; + if (mdoc->last->prev) + mdoc->last->prev->next = NULL; + + n = mdoc->last; + assert(NULL == mdoc->last->next); + + if (mdoc->last->prev) { + mdoc->last = mdoc->last->prev; + mdoc->next = MDOC_NEXT_SIBLING; + } else { + mdoc->last = mdoc->last->parent; + mdoc->next = MDOC_NEXT_CHILD; } - if (mdoc->meta.date && NULL == n) - return(1); - else if (n) - return(mdoc_err(mdoc, "invalid parameter syntax")); - if ((mdoc->meta.date = mdoc_atotime(date))) - return(1); - return(mdoc_err(mdoc, "invalid parameter syntax")); + mdoc_node_freelist(n); + return(1); } int mdoc_action_post(struct mdoc *mdoc) { + + if (MDOC_ACTED & mdoc->last->flags) + return(1); + mdoc->last->flags |= MDOC_ACTED; if (MDOC_TEXT == mdoc->last->type) return(1);