===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_action.c,v
retrieving revision 1.84
retrieving revision 1.88
diff -u -p -r1.84 -r1.88
--- mandoc/Attic/mdoc_action.c	2010/11/29 15:45:15	1.84
+++ mandoc/Attic/mdoc_action.c	2010/11/30 12:59:20	1.88
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_action.c,v 1.84 2010/11/29 15:45:15 kristaps Exp $ */
+/*	$Id: mdoc_action.c,v 1.88 2010/11/30 12:59:20 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -40,34 +40,16 @@
 #define	POST_ARGS struct mdoc *m, struct mdoc_node *n
 #define	PRE_ARGS  struct mdoc *m, struct mdoc_node *n
 
-#define	NUMSIZ	  32
-#define	DATESIZ	  32
-
 struct	actions {
 	int	(*pre)(PRE_ARGS);
 	int	(*post)(POST_ARGS);
 };
 
-static	int	  concat(struct mdoc *, char *,
-			const struct mdoc_node *, size_t);
-
-static	int	  post_bl(POST_ARGS);
-static	int	  post_bl_head(POST_ARGS);
-static	int	  post_bl_tagwidth(POST_ARGS);
-static	int	  post_bl_width(POST_ARGS);
-static	int	  post_dd(POST_ARGS);
-static	int	  post_dt(POST_ARGS);
-static	int	  post_nm(POST_ARGS);
-static	int	  post_os(POST_ARGS);
-static	int	  post_pa(POST_ARGS);
-static	int	  post_prol(POST_ARGS);
-static	int	  post_std(POST_ARGS);
-
 static	const struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL, NULL }, /* Ap */
-	{ NULL, post_dd }, /* Dd */ 
-	{ NULL, post_dt }, /* Dt */ 
-	{ NULL, post_os }, /* Os */ 
+	{ NULL, NULL }, /* Dd */ 
+	{ NULL, NULL }, /* Dt */ 
+	{ NULL, NULL }, /* Os */ 
 	{ NULL, NULL }, /* Sh */ 
 	{ NULL, NULL }, /* Ss */ 
 	{ NULL, NULL }, /* Pp */ 
@@ -75,7 +57,7 @@ static	const struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL, NULL }, /* Dl */
 	{ NULL, NULL }, /* Bd */ 
 	{ NULL, NULL }, /* Ed */
-	{ NULL, post_bl }, /* Bl */ 
+	{ NULL, NULL }, /* Bl */ 
 	{ NULL, NULL }, /* El */
 	{ NULL, NULL }, /* It */
 	{ NULL, NULL }, /* Ad */ 
@@ -86,7 +68,7 @@ static	const struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL, NULL }, /* Dv */ 
 	{ NULL, NULL }, /* Er */ 
 	{ NULL, NULL }, /* Ev */ 
-	{ NULL, post_std }, /* Ex */
+	{ NULL, NULL }, /* Ex */
 	{ NULL, NULL }, /* Fa */ 
 	{ NULL, NULL }, /* Fd */ 
 	{ NULL, NULL }, /* Fl */
@@ -96,11 +78,11 @@ static	const struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL, NULL }, /* In */ 
 	{ NULL, NULL }, /* Li */
 	{ NULL, NULL }, /* Nd */ 
-	{ NULL, post_nm }, /* Nm */ 
+	{ NULL, NULL }, /* Nm */ 
 	{ NULL, NULL }, /* Op */
 	{ NULL, NULL }, /* Ot */
-	{ NULL, post_pa }, /* Pa */
-	{ NULL, post_std }, /* Rv */
+	{ NULL, NULL }, /* Pa */
+	{ NULL, NULL }, /* Rv */
 	{ NULL, NULL }, /* St */
 	{ NULL, NULL }, /* Va */
 	{ NULL, NULL }, /* Vt */ 
@@ -230,491 +212,3 @@ mdoc_action_post(struct mdoc *m)
 	return((*mdoc_actions[m->last->tok].post)(m, m->last));
 }
 
-
-/*
- * Concatenate sibling nodes together.  All siblings must be of type
- * MDOC_TEXT or an assertion is raised.  Concatenation is separated by a
- * single whitespace.
- */
-static int
-concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
-{
-
-	assert(sz);
-	p[0] = '\0';
-	for ( ; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-		/*
-		 * XXX: yes, these can technically be resized, but it's
-		 * highly unlikely that we're going to get here, so let
-		 * it slip for now.
-		 */
-		if (strlcat(p, n->string, sz) >= sz) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-		if (NULL == n->next)
-			continue;
-		if (strlcat(p, " ", sz) >= sz) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-	}
-
-	return(1);
-}
-
-
-/*
- * Macros accepting `-std' as an argument have the name of the current
- * document (`Nm') filled in as the argument if it's not provided.
- */
-static int
-post_std(POST_ARGS)
-{
-	struct mdoc_node *nn;
-
-	if (n->child)
-		return(1);
-	if (NULL == m->meta.name)
-		return(1);
-	
-	nn = n;
-	m->next = MDOC_NEXT_CHILD;
-
-	if ( ! mdoc_word_alloc(m, n->line, n->pos, m->meta.name))
-		return(0);
-	m->last = nn;
-	return(1);
-}
-
-
-/*
- * The `Nm' macro's first use sets the name of the document.  See also
- * post_std(), etc.
- */
-static int
-post_nm(POST_ARGS)
-{
-	char		 buf[BUFSIZ];
-
-	if (m->meta.name)
-		return(1);
-	if ( ! concat(m, buf, n->child, BUFSIZ))
-		return(0);
-	m->meta.name = mandoc_strdup(buf);
-	return(1);
-}
-
-/*
- * Parse out the contents of `Dt'.  See in-line documentation for how we
- * handle the various fields of this macro.
- */
-static int
-post_dt(POST_ARGS)
-{
-	struct mdoc_node *nn;
-	const char	 *cp;
-
-	if (m->meta.title)
-		free(m->meta.title);
-	if (m->meta.vol)
-		free(m->meta.vol);
-	if (m->meta.arch)
-		free(m->meta.arch);
-
-	m->meta.title = m->meta.vol = m->meta.arch = NULL;
-	/* Handles: `.Dt' 
-	 *   --> title = unknown, volume = local, msec = 0, arch = NULL
-	 */
-
-	if (NULL == (nn = n->child)) {
-		/* XXX: make these macro values. */
-		/* FIXME: warn about missing values. */
-		m->meta.title = mandoc_strdup("UNKNOWN");
-		m->meta.vol = mandoc_strdup("LOCAL");
-		m->meta.msec = mandoc_strdup("1");
-		return(post_prol(m, n));
-	}
-
-	/* Handles: `.Dt TITLE' 
-	 *   --> title = TITLE, volume = local, msec = 0, arch = NULL
-	 */
-
-	m->meta.title = mandoc_strdup
-		('\0' == nn->string[0] ? "UNKNOWN" : nn->string);
-
-	if (NULL == (nn = nn->next)) {
-		/* FIXME: warn about missing msec. */
-		/* XXX: make this a macro value. */
-		m->meta.vol = mandoc_strdup("LOCAL");
-		m->meta.msec = mandoc_strdup("1");
-		return(post_prol(m, n));
-	}
-
-	/* Handles: `.Dt TITLE SEC'
-	 *   --> title = TITLE, volume = SEC is msec ? 
-	 *           format(msec) : SEC,
-	 *       msec = SEC is msec ? atoi(msec) : 0,
-	 *       arch = NULL
-	 */
-
-	cp = mdoc_a2msec(nn->string);
-	if (cp) {
-		m->meta.vol = mandoc_strdup(cp);
-		m->meta.msec = mandoc_strdup(nn->string);
-	} else if (mdoc_nmsg(m, n, MANDOCERR_BADMSEC)) {
-		m->meta.vol = mandoc_strdup(nn->string);
-		m->meta.msec = mandoc_strdup(nn->string);
-	} else
-		return(0);
-
-	if (NULL == (nn = nn->next))
-		return(post_prol(m, n));
-
-	/* Handles: `.Dt TITLE SEC VOL'
-	 *   --> title = TITLE, volume = VOL is vol ?
-	 *       format(VOL) : 
-	 *           VOL is arch ? format(arch) : 
-	 *               VOL
-	 */
-
-	cp = mdoc_a2vol(nn->string);
-	if (cp) {
-		free(m->meta.vol);
-		m->meta.vol = mandoc_strdup(cp);
-	} else {
-		/* FIXME: warn about bad arch. */
-		cp = mdoc_a2arch(nn->string);
-		if (NULL == cp) {
-			free(m->meta.vol);
-			m->meta.vol = mandoc_strdup(nn->string);
-		} else 
-			m->meta.arch = mandoc_strdup(cp);
-	}	
-
-	/* Ignore any subsequent parameters... */
-	/* FIXME: warn about subsequent parameters. */
-
-	return(post_prol(m, n));
-}
-
-
-/*
- * Set the operating system by way of the `Os' macro.  Note that if an
- * argument isn't provided and -DOSNAME="\"foo\"" is provided during
- * compilation, this value will be used instead of filling in "sysname
- * release" from uname().
- */
-static int
-post_os(POST_ARGS)
-{
-	char		  buf[BUFSIZ];
-#ifndef OSNAME
-	struct utsname	  utsname;
-#endif
-
-	if (m->meta.os)
-		free(m->meta.os);
-
-	if ( ! concat(m, buf, n->child, BUFSIZ))
-		return(0);
-
-	/* XXX: yes, these can all be dynamically-adjusted buffers, but
-	 * it's really not worth the extra hackery.
-	 */
-
-	if ('\0' == buf[0]) {
-#ifdef OSNAME
-		if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-#else /*!OSNAME */
-		if (-1 == uname(&utsname))
-			return(mdoc_nmsg(m, n, MANDOCERR_UTSNAME));
-
-		if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-		if (strlcat(buf, " ", 64) >= BUFSIZ) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-		if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-#endif /*!OSNAME*/
-	}
-
-	m->meta.os = mandoc_strdup(buf);
-	return(post_prol(m, n));
-}
-
-
-/*
- * Calculate the -width for a `Bl -tag' list if it hasn't been provided.
- * Uses the first head macro.  NOTE AGAIN: this is ONLY if the -width
- * argument has NOT been provided.  See post_bl_width() for converting
- * the -width string.
- */
-static int
-post_bl_tagwidth(POST_ARGS)
-{
-	struct mdoc_node *nn;
-	size_t		  sz, ssz;
-	int		  i;
-	char		  buf[NUMSIZ];
-
-	sz = 10;
-
-	for (nn = n->body->child; nn; nn = nn->next) {
-		if (MDOC_It != nn->tok)
-			continue;
-
-		assert(MDOC_BLOCK == nn->type);
-		nn = nn->head->child;
-
-		if (nn == NULL) {
-			/* No -width for .Bl and first .It is emtpy */
-			if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG))
-				return(0);
-			break;
-		}
-
-		if (MDOC_TEXT == nn->type) {
-			sz = strlen(nn->string) + 1;
-			break;
-		}
-
-		if (0 != (ssz = mdoc_macro2len(nn->tok)))
-			sz = ssz;
-		else if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG))
-			return(0);
-
-		break;
-	} 
-
-	/* Defaults to ten ens. */
-
-	snprintf(buf, NUMSIZ, "%zun", sz);
-
-	/*
-	 * We have to dynamically add this to the macro's argument list.
-	 * We're guaranteed that a MDOC_Width doesn't already exist.
-	 */
-
-	assert(n->args);
-	i = (int)(n->args->argc)++;
-
-	n->args->argv = mandoc_realloc(n->args->argv, 
-			n->args->argc * sizeof(struct mdoc_argv));
-
-	n->args->argv[i].arg = MDOC_Width;
-	n->args->argv[i].line = n->line;
-	n->args->argv[i].pos = n->pos;
-	n->args->argv[i].sz = 1;
-	n->args->argv[i].value = mandoc_malloc(sizeof(char *));
-	n->args->argv[i].value[0] = mandoc_strdup(buf);
-
-	/* Set our width! */
-	n->data.Bl->width = n->args->argv[i].value[0];
-	return(1);
-}
-
-
-/*
- * Calculate the real width of a list from the -width string, which may
- * contain a macro (with a known default width), a literal string, or a
- * scaling width.
- */
-static int
-post_bl_width(POST_ARGS)
-{
-	size_t		  width;
-	int		  i;
-	enum mdoct	  tok;
-	char		  buf[NUMSIZ];
-
-	/*
-	 * If the value to -width is a macro, then we re-write it to be
-	 * the macro's width as set in share/tmac/mdoc/doc-common.
-	 */
-
-	if (0 == strcmp(n->data.Bl->width, "Ds"))
-		width = 6;
-	else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width)))
-		return(1);
-	else if (0 == (width = mdoc_macro2len(tok))) 
-		return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH));
-
-	/* The value already exists: free and reallocate it. */
-
-	assert(n->args);
-
-	for (i = 0; i < (int)n->args->argc; i++) 
-		if (MDOC_Width == n->args->argv[i].arg)
-			break;
-
-	assert(i < (int)n->args->argc);
-
-	snprintf(buf, NUMSIZ, "%zun", width);
-	free(n->args->argv[i].value[0]);
-	n->args->argv[i].value[0] = mandoc_strdup(buf);
-
-	/* Set our width! */
-	n->data.Bl->width = n->args->argv[i].value[0];
-	return(1);
-}
-
-
-/*
- * Do processing for -column lists, which can have two distinct styles
- * of invocation.  Merge this two styles into a consistent form.
- */
-/* ARGSUSED */
-static int
-post_bl_head(POST_ARGS)
-{
-	int			 i, c;
-	struct mdoc_node	*np, *nn, *nnp;
-
-	if (LIST_column != n->data.Bl->type)
-		return(1);
-	else if (NULL == n->child)
-		return(1);
-
-	np = n->parent;
-	assert(np->args);
-
-	for (c = 0; c < (int)np->args->argc; c++) 
-		if (MDOC_Column == np->args->argv[c].arg)
-			break;
-
-	assert(c < (int)np->args->argc);
-	assert(0 == np->args->argv[c].sz);
-
-	/*
-	 * Accomodate for new-style groff column syntax.  Shuffle the
-	 * child nodes, all of which must be TEXT, as arguments for the
-	 * column field.  Then, delete the head children.
-	 */
-
-	np->args->argv[c].sz = (size_t)n->nchild;
-	np->args->argv[c].value = mandoc_malloc
-		((size_t)n->nchild * sizeof(char *));
-
-	n->data.Bl->ncols = np->args->argv[c].sz;
-	n->data.Bl->cols = (const char **)np->args->argv[c].value;
-
-	for (i = 0, nn = n->child; nn; i++) {
-		np->args->argv[c].value[i] = nn->string;
-		nn->string = NULL;
-		nnp = nn;
-		nn = nn->next;
-		mdoc_node_delete(NULL, nnp);
-	}
-
-	n->nchild = 0;
-	n->child = NULL;
-	return(1);
-}
-
-
-static int
-post_bl(POST_ARGS)
-{
-
-	if (MDOC_HEAD == n->type)
-		return(post_bl_head(m, n));
-	if (MDOC_BLOCK != n->type)
-		return(1);
-
-	/*
-	 * These are fairly complicated, so we've broken them into two
-	 * functions.  post_bl_tagwidth() is called when a -tag is
-	 * specified, but no -width (it must be guessed).  The second
-	 * when a -width is specified (macro indicators must be
-	 * rewritten into real lengths).
-	 */
-
-	if (LIST_tag == n->data.Bl->type && NULL == n->data.Bl->width) {
-		if ( ! post_bl_tagwidth(m, n))
-			return(0);
-	} else if (NULL != n->data.Bl->width) {
-		if ( ! post_bl_width(m, n))
-			return(0);
-	} else 
-		return(1);
-
-	assert(n->data.Bl->width);
-	return(1);
-}
-
-
-/*
- * The `Pa' macro defaults to a tilde if no value is provided as an
- * argument.
- */
-static int
-post_pa(POST_ARGS)
-{
-	struct mdoc_node *np;
-
-	if (n->child)
-		return(1);
-	
-	np = n;
-	m->next = MDOC_NEXT_CHILD;
-	if ( ! mdoc_word_alloc(m, n->line, n->pos, "~"))
-		return(0);
-	m->last = np;
-	return(1);
-}
-
-
-/*
- * Parse the date field in `Dd'.
- */
-static int
-post_dd(POST_ARGS)
-{
-	char		buf[DATESIZ];
-
-	if (NULL == n->child) {
-		m->meta.date = time(NULL);
-		return(post_prol(m, n));
-	}
-
-	if ( ! concat(m, buf, n->child, DATESIZ))
-		return(0);
-
-	m->meta.date = mandoc_a2time
-		(MTIME_MDOCDATE | MTIME_CANONICAL, buf);
-
-	if (0 == m->meta.date) {
-		if ( ! mdoc_nmsg(m, n, MANDOCERR_BADDATE))
-			return(0);
-		m->meta.date = time(NULL);
-	}
-
-	return(post_prol(m, n));
-}
-
-
-/*
- * Remove prologue macros from the document after they're processed.
- * The final document uses mdoc_meta for these values and discards the
- * originals.
- */
-static int
-post_prol(POST_ARGS)
-{
-
-	mdoc_node_delete(m, n);
-	if (m->meta.title && m->meta.date && m->meta.os)
-		m->flags |= MDOC_PBODY;
-	return(1);
-}