===================================================================
RCS file: /cvs/mandoc/Attic/action.c,v
retrieving revision 1.4
retrieving revision 1.12
diff -u -p -r1.4 -r1.12
--- mandoc/Attic/action.c	2009/01/08 15:05:50	1.4
+++ mandoc/Attic/action.c	2009/01/19 17:02:58	1.12
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.4 2009/01/08 15:05:50 kristaps Exp $ */
+/* $Id: action.c,v 1.12 2009/01/19 17:02:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,228 +18,214 @@
  */
 #include <assert.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "private.h"
 
-typedef int	(*a_pre)(struct mdoc *, struct mdoc_node *);
-typedef int	(*a_post)(struct mdoc *);
 
-
 struct	actions {
-	a_pre	 pre;
-	a_post	 post;
+	int	(*post)(struct mdoc *);
 };
 
+/* 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 *);
 
+/* Array of macro action routines. */
 
 const	struct actions mdoc_actions[MDOC_MAX] = {
-	{ NULL, NULL }, /* \" */
-	{ NULL, post_dd }, /* Dd */ 
-	{ NULL, post_dt }, /* Dt */ 
-	{ NULL, post_os }, /* Os */ 
-	{ NULL, post_sh }, /* Sh */ 
-	{ NULL, NULL }, /* Ss */ 
-	{ NULL, NULL }, /* Pp */ 
-	{ NULL, NULL }, /* D1 */
-	{ NULL, NULL }, /* Dl */
-	{ NULL, NULL }, /* Bd */ 
-	{ NULL, NULL }, /* Ed */
-	{ NULL, NULL }, /* Bl */ 
-	{ NULL, NULL }, /* El */
-	{ NULL, NULL }, /* It */
-	{ NULL, NULL }, /* Ad */ 
-	{ NULL, NULL }, /* An */
-	{ NULL, NULL }, /* Ar */
-	{ NULL, NULL }, /* Cd */
-	{ NULL, NULL }, /* Cm */
-	{ NULL, NULL }, /* Dv */ 
-	{ NULL, NULL }, /* Er */ 
-	{ NULL, NULL }, /* Ev */ 
-	{ NULL, NULL }, /* Ex */
-	{ NULL, NULL }, /* Fa */ 
-	{ NULL, NULL }, /* Fd */ 
-	{ NULL, NULL }, /* Fl */
-	{ NULL, NULL }, /* Fn */ 
-	{ NULL, NULL }, /* Ft */ 
-	{ NULL, NULL }, /* Ic */ 
-	{ NULL, NULL }, /* In */ 
-	{ NULL, NULL }, /* Li */
-	{ NULL, NULL }, /* Nd */ 
-	{ NULL, NULL }, /* Nm */ 
-	{ NULL, NULL }, /* Op */
-	{ NULL, NULL }, /* Ot */
-	{ NULL, NULL }, /* Pa */
-	{ NULL, NULL }, /* Rv */
-	{ NULL, NULL }, /* St */
-	{ NULL, NULL }, /* Va */
-	{ NULL, NULL }, /* Vt */ 
-	{ NULL, NULL }, /* Xr */
-	{ NULL, NULL }, /* %A */
-	{ NULL, NULL }, /* %B */
-	{ NULL, NULL }, /* %D */
-	{ NULL, NULL }, /* %I */
-	{ NULL, NULL }, /* %J */
-	{ NULL, NULL }, /* %N */
-	{ NULL, NULL }, /* %O */
-	{ NULL, NULL }, /* %P */
-	{ NULL, NULL }, /* %R */
-	{ NULL, NULL }, /* %T */
-	{ NULL, NULL }, /* %V */
-	{ NULL, NULL }, /* Ac */
-	{ NULL, NULL }, /* Ao */
-	{ NULL, NULL }, /* Aq */
-	{ NULL, NULL }, /* At */ 
-	{ NULL, NULL }, /* Bc */
-	{ NULL, NULL }, /* Bf */ 
-	{ NULL, NULL }, /* Bo */
-	{ NULL, NULL }, /* Bq */
-	{ NULL, NULL }, /* Bsx */
-	{ NULL, NULL }, /* Bx */
-	{ NULL, NULL }, /* Db */
-	{ NULL, NULL }, /* Dc */
-	{ NULL, NULL }, /* Do */
-	{ NULL, NULL }, /* Dq */
-	{ NULL, NULL }, /* Ec */
-	{ NULL, NULL }, /* Ef */
-	{ NULL, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
-	{ NULL, NULL }, /* Fx */
-	{ NULL, NULL }, /* Ms */
-	{ NULL, NULL }, /* No */
-	{ NULL, NULL }, /* Ns */
-	{ NULL, NULL }, /* Nx */
-	{ NULL, NULL }, /* Ox */
-	{ NULL, NULL }, /* Pc */
-	{ NULL, NULL }, /* Pf */
-	{ NULL, NULL }, /* Po */
-	{ NULL, NULL }, /* Pq */
-	{ NULL, NULL }, /* Qc */
-	{ NULL, NULL }, /* Ql */
-	{ NULL, NULL }, /* Qo */
-	{ NULL, NULL }, /* Qq */
-	{ NULL, NULL }, /* Re */
-	{ NULL, NULL }, /* Rs */
-	{ NULL, NULL }, /* Sc */
-	{ NULL, NULL }, /* So */
-	{ NULL, NULL }, /* Sq */
-	{ NULL, NULL }, /* Sm */
-	{ NULL, NULL }, /* Sx */
-	{ NULL, NULL }, /* Sy */
-	{ NULL, NULL }, /* Tn */
-	{ NULL, NULL }, /* Ux */
-	{ NULL, NULL }, /* Xc */
-	{ NULL, NULL }, /* Xo */
-	{ NULL, NULL }, /* Fo */ 
-	{ NULL, NULL }, /* Fc */ 
-	{ NULL, NULL }, /* Oo */
-	{ NULL, NULL }, /* Oc */
-	{ NULL, NULL }, /* Bk */
-	{ NULL, NULL }, /* Ek */
-	{ NULL, NULL }, /* Bt */
-	{ NULL, NULL }, /* Hf */
-	{ NULL, NULL }, /* Fr */
-	{ NULL, NULL }, /* Ud */
+	{ NULL }, /* \" */
+	{ post_dd }, /* Dd */ 
+	{ post_dt }, /* Dt */ 
+	{ post_os }, /* Os */ 
+	{ post_sh }, /* Sh */ 
+	{ NULL }, /* Ss */ 
+	{ NULL }, /* Pp */ 
+	{ NULL }, /* D1 */
+	{ NULL }, /* Dl */
+	{ NULL }, /* Bd */ 
+	{ NULL }, /* Ed */
+	{ NULL }, /* Bl */ 
+	{ NULL }, /* El */
+	{ NULL }, /* It */
+	{ NULL }, /* Ad */ 
+	{ NULL }, /* An */
+	{ NULL }, /* Ar */
+	{ NULL }, /* Cd */
+	{ NULL }, /* Cm */
+	{ NULL }, /* Dv */ 
+	{ NULL }, /* Er */ 
+	{ NULL }, /* Ev */ 
+	{ NULL }, /* Ex */
+	{ NULL }, /* Fa */ 
+	{ NULL }, /* Fd */ 
+	{ NULL }, /* Fl */
+	{ NULL }, /* Fn */ 
+	{ NULL }, /* Ft */ 
+	{ NULL }, /* Ic */ 
+	{ NULL }, /* In */ 
+	{ NULL }, /* Li */
+	{ NULL }, /* Nd */ 
+	{ post_nm }, /* Nm */ 
+	{ NULL }, /* Op */
+	{ NULL }, /* Ot */
+	{ NULL }, /* Pa */
+	{ NULL }, /* Rv */
+	{ NULL }, /* St */
+	{ NULL }, /* Va */
+	{ NULL }, /* Vt */ 
+	{ NULL }, /* Xr */
+	{ NULL }, /* %A */
+	{ NULL }, /* %B */
+	{ NULL }, /* %D */
+	{ NULL }, /* %I */
+	{ NULL }, /* %J */
+	{ NULL }, /* %N */
+	{ NULL }, /* %O */
+	{ NULL }, /* %P */
+	{ NULL }, /* %R */
+	{ NULL }, /* %T */
+	{ NULL }, /* %V */
+	{ NULL }, /* Ac */
+	{ NULL }, /* Ao */
+	{ NULL }, /* Aq */
+	{ NULL }, /* At */ 
+	{ NULL }, /* Bc */
+	{ NULL }, /* Bf */ 
+	{ NULL }, /* Bo */
+	{ NULL }, /* Bq */
+	{ NULL }, /* Bsx */
+	{ NULL }, /* Bx */
+	{ NULL }, /* Db */
+	{ NULL }, /* Dc */
+	{ NULL }, /* Do */
+	{ NULL }, /* Dq */
+	{ NULL }, /* Ec */
+	{ NULL }, /* Ef */
+	{ NULL }, /* Em */ 
+	{ NULL }, /* Eo */
+	{ NULL }, /* Fx */
+	{ NULL }, /* Ms */
+	{ NULL }, /* No */
+	{ NULL }, /* Ns */
+	{ NULL }, /* Nx */
+	{ NULL }, /* Ox */
+	{ NULL }, /* Pc */
+	{ NULL }, /* Pf */
+	{ NULL }, /* Po */
+	{ NULL }, /* Pq */
+	{ NULL }, /* Qc */
+	{ NULL }, /* Ql */
+	{ NULL }, /* Qo */
+	{ NULL }, /* Qq */
+	{ NULL }, /* Re */
+	{ NULL }, /* Rs */
+	{ NULL }, /* Sc */
+	{ NULL }, /* So */
+	{ NULL }, /* Sq */
+	{ NULL }, /* Sm */
+	{ NULL }, /* Sx */
+	{ NULL }, /* Sy */
+	{ NULL }, /* Tn */
+	{ NULL }, /* Ux */
+	{ NULL }, /* Xc */
+	{ NULL }, /* Xo */
+	{ NULL }, /* Fo */ 
+	{ NULL }, /* Fc */ 
+	{ NULL }, /* Oo */
+	{ NULL }, /* Oc */
+	{ NULL }, /* Bk */
+	{ NULL }, /* Ek */
+	{ NULL }, /* Bt */
+	{ NULL }, /* Hf */
+	{ NULL }, /* Fr */
+	{ NULL }, /* Ud */
 };
 
 
 static int
-post_sh(struct mdoc *mdoc)
+post_nm(struct mdoc *mdoc)
 {
-	enum mdoc_sec	  sec;
-	int		  i;
-	struct mdoc_node *n;
-	char		 *args[MDOC_LINEARG_MAX];
+	char		 buf[64];
 
-	if (MDOC_HEAD != mdoc->last->type)
+	assert(MDOC_ELEM == mdoc->last->type);
+	assert(MDOC_Nm == mdoc->last->tok);
+
+	if (mdoc->meta.name)
 		return(1);
-	
-	assert(MDOC_Sh == mdoc->last->data.head.tok);
 
-	n = mdoc->last->child;
-	assert(n);
-
-	for (i = 0; n && i < MDOC_LINEARG_MAX; n = n->next, i++) {
-		assert(MDOC_TEXT == n->type);
-		assert(NULL == n->child);
-		assert(n->data.text.string);
-		args[i] = n->data.text.string;
+	if (xstrlcats(buf, mdoc->last->child, 64)) {
+		mdoc->meta.name = xstrdup(buf);
+		return(1);
 	}
 
-	sec = mdoc_atosec((size_t)i, (const char **)args);
-	if (SEC_CUSTOM != sec)
-		mdoc->sec_lastn = sec;
-	mdoc->sec_last = sec;
-
-	return(1);
+	return(mdoc_err(mdoc, "macro parameters too long"));
 }
 
 
 static int
-post_dt(struct mdoc *mdoc)
+post_sh(struct mdoc *mdoc)
 {
-#if 0
-	int		  lastarg, j;
-	char		 *args[MDOC_LINEARG_MAX];
+	enum mdoc_sec	 sec;
+	char		 buf[64];
 
-	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-	if (0 == mdoc->meta.date)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-	if (mdoc->meta.title[0])
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+	if (MDOC_HEAD != mdoc->last->type)
+		return(1);
+	if (xstrlcats(buf, mdoc->last->child, 64)) {
+		if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
+			mdoc->sec_lastn = sec;
+		mdoc->sec_last = sec;
+		return(1);
+	}
 
-	j = -1;
-	lastarg = ppos;
+	return(mdoc_err(mdoc, "macro parameters too long"));
+}
 
-again:
-	if (j == MDOC_LINEARG_MAX)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
 
-	lastarg = *pos;
+static int
+post_dt(struct mdoc *mdoc)
+{
+	int		  i;
+	char		 *p;
+	struct mdoc_node *n;
 
-	switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) {
-	case (ARGS_EOLN):
-		if (mdoc->meta.title)
-			return(1);
-		if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1))
-			return(0);
-		(void)xstrlcpy(mdoc->meta.title, 
-				"UNTITLED", META_TITLE_SZ);
-		return(1);
-	case (ARGS_ERROR):
-		return(0);
-	default:
-		break;
-	}
+	assert(MDOC_ELEM == mdoc->last->type);
+	assert(MDOC_Dt == mdoc->last->tok);
 
-	if (0 == j) {
-		if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ))
-			goto again;
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+	assert(NULL == mdoc->meta.title);
 
-	} else if (1 == j) {
-		mdoc->meta.msec = mdoc_atomsec(args[1]);
-		if (MSEC_DEFAULT != mdoc->meta.msec)
-			goto again;
-		return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGFORM));
+	for (i = 0, n = mdoc->last->child; n; n = n->next, i++) {
+		assert(MDOC_TEXT == n->type);
+		p = n->data.text.string;
 
-	} else if (2 == j) {
-		mdoc->meta.vol = mdoc_atovol(args[2]);
-		if (VOL_DEFAULT != mdoc->meta.vol)
-			goto again;
-		mdoc->meta.arch = mdoc_atoarch(args[2]);
-		if (ARCH_DEFAULT != mdoc->meta.arch)
-			goto again;
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+		switch (i) {
+		case (0):
+			mdoc->meta.title = xstrdup(p);
+			break;
+		case (1):
+			mdoc->meta.msec = mdoc_atomsec(p);
+			if (MSEC_DEFAULT != mdoc->meta.msec)
+				break;
+			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
+		case (2):
+			mdoc->meta.vol = mdoc_atovol(p);
+			if (VOL_DEFAULT != mdoc->meta.vol)
+				break;
+			mdoc->meta.arch = mdoc_atoarch(p);
+			if (ARCH_DEFAULT != mdoc->meta.arch)
+				break;
+			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
+		default:
+			return(mdoc_nerr(mdoc, n, "too many parameters"));
+		}
 	}
 
-	return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-#endif
+	if (NULL == mdoc->meta.title)
+		mdoc->meta.title = xstrdup("untitled");
 	return(1);
 }
 
@@ -247,47 +233,17 @@ again:
 static int
 post_os(struct mdoc *mdoc)
 {
-#if 0
-	int		  lastarg, j;
-	char		 *args[MDOC_LINEARG_MAX];
+	char		  buf[64];
 
-	/* FIXME: if we use `Os' again... ? */
+	assert(MDOC_ELEM == mdoc->last->type);
+	assert(MDOC_Os == mdoc->last->tok);
+	assert(NULL == mdoc->meta.os);
 
-	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-	if (0 == mdoc->meta.title[0])
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-	if (mdoc->meta.os[0])
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+	if ( ! xstrlcats(buf, mdoc->last->child, 64))
+		return(mdoc_err(mdoc, "macro parameters too long")); 
 
-	j = -1;
-	lastarg = ppos;
-
-again:
-	if (j == MDOC_LINEARG_MAX)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-
-	lastarg = *pos;
-
-	switch (mdoc_args(mdoc, tok, pos, buf, 
-				ARGS_QUOTED, &args[++j])) {
-	case (ARGS_EOLN):
-		mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
-		return(1);
-	case (ARGS_ERROR):
-		return(0);
-	default:
-		break;
-	}
-	
-	if ( ! xstrlcat(mdoc->meta.os, args[j], sizeof(mdoc->meta.os)))
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-	if ( ! xstrlcat(mdoc->meta.os, " ", sizeof(mdoc->meta.os)))
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-
-	goto again;
-	/* NOTREACHED */
-#endif
+	mdoc->meta.os = xstrdup(buf[0] ? buf : "local");
+	mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
 	return(1);
 }
 
@@ -295,98 +251,62 @@ again:
 static int
 post_dd(struct mdoc *mdoc)
 {
-#if 0
-	int		  lastarg, j;
-	char		 *args[MDOC_LINEARG_MAX], date[64];
+	char		  date[64];
+	size_t		  sz;
+	char		 *p;
+	struct mdoc_node *n;
 
-	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-	if (mdoc->meta.title[0])
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-	if (mdoc->meta.date)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+	assert(MDOC_ELEM == mdoc->last->type);
+	assert(MDOC_Dd == mdoc->last->tok);
 
-	j = -1;
+	n = mdoc->last->child; 
+	assert(0 == mdoc->meta.date);
 	date[0] = 0;
-	lastarg = ppos;
 
-again:
-	if (j == MDOC_LINEARG_MAX)
-		return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+	sz = 64;
 
-	lastarg = *pos;
-	switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) {
-	case (ARGS_EOLN):
-		if (mdoc->meta.date)
-			return(1);
-		mdoc->meta.date = mdoc_atotime(date);
-		if (mdoc->meta.date)
-			return(1);
-		return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGFORM));
-	case (ARGS_ERROR):
-		return(0);
-	default:
-		break;
-	}
-	
-	if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
-			(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
-		return(0);
-	
-	if (0 == j) {
-		if (xstrcmp("$Mdocdate: January 8 2009 $", args[j])) {
+	for ( ; 0 == mdoc->meta.date && n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+		p = n->data.text.string;
+
+		if (xstrcmp(p, "$Mdocdate: January 19 2009 $")) {
 			mdoc->meta.date = time(NULL);
-			goto again;
-		} else if (xstrcmp("$Mdocdate:", args[j])) 
-			goto again;
-	} else if (4 == j)
-		if ( ! xstrcmp("$", args[j]))
-			goto again;
+			continue;
+		} else if (xstrcmp(p, "$")) {
+			mdoc->meta.date = mdoc_atotime(date);
+			continue;
+		} else if (xstrcmp(p, "$Mdocdate:"))
+			continue;
 
-	if ( ! xstrlcat(date, args[j], sizeof(date)))
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-	if ( ! xstrlcat(date, " ", sizeof(date)))
-		return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+		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"));
+	}
 
-	goto again;
-	/* NOTREACHED */
-#endif
-	return(1);
+	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"));
 }
 
 
 int
-mdoc_action_pre(struct mdoc *mdoc, struct mdoc_node *node)
-{
-
-	return(1);
-}
-
-
-int
 mdoc_action_post(struct mdoc *mdoc)
 {
-	int		 t;
 
-	switch (mdoc->last->type) {
-	case (MDOC_BODY):
-		t = mdoc->last->data.body.tok;
-		break;
-	case (MDOC_ELEM):
-		t = mdoc->last->data.elem.tok;
-		break;
-	case (MDOC_BLOCK):
-		t = mdoc->last->data.block.tok;
-		break;
-	case (MDOC_HEAD):
-		t = mdoc->last->data.head.tok;
-		break;
-	default:
+	if (MDOC_ACTED & mdoc->last->flags)
 		return(1);
-	}
+	mdoc->last->flags |= MDOC_ACTED;
 
-	if (NULL == mdoc_actions[t].post)
+	if (MDOC_TEXT == mdoc->last->type)
 		return(1);
-	/* TODO: MDOC_Nm... ? */
-	return((*mdoc_actions[t].post)(mdoc));
+	if (MDOC_ROOT == mdoc->last->type)
+		return(1);
+	if (NULL == mdoc_actions[mdoc->last->tok].post)
+		return(1);
+	return((*mdoc_actions[mdoc->last->tok].post)(mdoc));
 }