===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.38
retrieving revision 1.43
diff -u -p -r1.38 -r1.43
--- mandoc/Attic/mdocml.c	2009/01/09 14:45:44	1.38
+++ mandoc/Attic/mdocml.c	2009/01/15 15:59:19	1.43
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.38 2009/01/09 14:45:44 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.43 2009/01/15 15:59:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -42,8 +42,6 @@ struct	md_parse {
 	u_long		 bufsz;
 	char		*name;
 	int		 fd;
-	int		 lnn;
-	char		*line;
 };
 
 static	void		 usage(void);
@@ -192,39 +190,34 @@ print_node(const struct mdoc_node *n, int indent)
 	params = NULL;
 	sz = 0;
 
+	t = mdoc_type2a(n->type);
+
 	switch (n->type) {
 	case (MDOC_TEXT):
 		assert(NULL == n->child);
 		p = n->data.text.string;
-		t = "text";
 		break;
 	case (MDOC_BODY):
-		p = mdoc_macronames[n->data.body.tok];
-		t = "block-body";
+		p = mdoc_macronames[n->tok];
 		break;
 	case (MDOC_HEAD):
-		p = mdoc_macronames[n->data.head.tok];
-		t = "block-head";
+		p = mdoc_macronames[n->tok];
 		break;
 	case (MDOC_TAIL):
-		p = mdoc_macronames[n->data.tail.tok];
-		t = "block-tail";
+		p = mdoc_macronames[n->tok];
 		break;
 	case (MDOC_ELEM):
-		p = mdoc_macronames[n->data.elem.tok];
-		t = "element";
+		p = mdoc_macronames[n->tok];
 		argv = n->data.elem.argv;
 		argc = n->data.elem.argc;
 		break;
 	case (MDOC_BLOCK):
-		p = mdoc_macronames[n->data.block.tok];
-		t = "block";
+		p = mdoc_macronames[n->tok];
 		argv = n->data.block.argv;
 		argc = n->data.block.argc;
 		break;
 	case (MDOC_ROOT):
 		p = "root";
-		t = "root";
 		break;
 	default:
 		abort();
@@ -237,14 +230,18 @@ print_node(const struct mdoc_node *n, int indent)
 
 	for (i = 0; i < (int)argc; i++) {
 		(void)printf(" -%s", mdoc_argnames[argv[i].arg]);
+		if (argv[i].sz > 0)
+			(void)printf(" [");
 		for (j = 0; j < (int)argv[i].sz; j++)
-			(void)printf(" \"%s\"", argv[i].value[j]);
+			(void)printf(" [%s]", argv[i].value[j]);
+		if (argv[i].sz > 0)
+			(void)printf(" ]");
 	}
 
 	for (i = 0; i < (int)sz; i++)
-		(void)printf(" \"%s\"", params[i]);
+		(void)printf(" [%s]", params[i]);
 
-	(void)printf("\n");
+	(void)printf(" %d:%d\n", n->line, n->pos);
 
 	if (n->child)
 		print_node(n->child, indent + 1);
@@ -279,6 +276,7 @@ parse_begin(struct md_parse *p)
 	size_t		 pos;
 	char		 line[256], sv[256];
 	struct mdoc_cb	 cb;
+	int		 lnn;
 
 	cb.mdoc_err = msg_err;
 	cb.mdoc_warn = msg_warn;
@@ -287,10 +285,7 @@ parse_begin(struct md_parse *p)
 	if (NULL == (p->mdoc = mdoc_alloc(p, &cb)))
 		return(parse_leave(p, 0));
 
-	p->lnn = 1;
-	p->line = sv;
-
-	for (pos = 0; ; ) {
+	for (lnn = 1, pos = 0; ; ) {
 		if (-1 == (sz = read(p->fd, p->buf, p->bufsz))) {
 			warn("%s", p->name);
 			return(parse_leave(p, 0));
@@ -306,15 +301,15 @@ parse_begin(struct md_parse *p)
 					continue;
 				}
 				warnx("%s: line %d too long", 
-						p->name, p->lnn);
+						p->name, lnn);
 				return(parse_leave(p, 0));
 			}
 	
 			line[(int)pos] = sv[(int)pos] = 0;
-			if ( ! mdoc_parseln(p->mdoc, p->lnn, line))
+			if ( ! mdoc_parseln(p->mdoc, lnn, line))
 				return(parse_leave(p, 0));
 
-			p->lnn++;
+			lnn++;
 			pos = 0;
 		}
 	}
@@ -328,7 +323,6 @@ msg_err(void *arg, int line, int col, enum mdoc_err ty
 {
 	char		 *lit;
 	struct md_parse	 *p;
-	int		  i;
 
 	p = (struct md_parse *)arg;
 
@@ -357,8 +351,7 @@ msg_err(void *arg, int line, int col, enum mdoc_err ty
 		lit = "syntax: unknown argument for macro";
 		break;
 	case (ERR_SCOPE_BREAK):
-		/* Which scope is broken? */
-		lit = "scope: macro breaks prior explicit scope";
+		lit = "scope: macro breaks prior scope";
 		break;
 	case (ERR_SCOPE_NOCTX):
 		lit = "scope: closure macro has no context";
@@ -409,11 +402,20 @@ msg_err(void *arg, int line, int col, enum mdoc_err ty
 		lit = "syntax: expected value for macro argument";
 		break;
 	case (ERR_SYNTAX_ARGBAD):
-		lit = "syntax: invalid value for macro argument";
+		lit = "syntax: invalid value(s) for macro argument";
 		break;
+	case (ERR_SYNTAX_ARGMISS):
+		lit = "syntax: missing required argument(s) for macro";
+		break;
 	case (ERR_SYNTAX_ARGMANY):
 		lit = "syntax: too many values for macro argument";
 		break;
+	case (ERR_SYNTAX_CHILDBAD):
+		lit = "syntax: invalid child for parent macro";
+		break;
+	case (ERR_SYNTAX_PARENTBAD):
+		lit = "syntax: invalid parent for macro";
+		break;
 	case (ERR_SYNTAX_CHILDHEAD):
 		lit = "syntax: expected only block-header section";
 		break;
@@ -431,18 +433,8 @@ msg_err(void *arg, int line, int col, enum mdoc_err ty
 		/* NOTREACHED */
 	}
 
-	(void)fprintf(stderr, "%s:%d: error: %s", p->name, p->lnn, lit);
-
-	if (p->dbg < 1) {
-		(void)fprintf(stderr, " (column %d)\n", col);
-		return(0);
-	} 
-
-	(void)fprintf(stderr, "\nFrom: %s\n      ", p->line);
-	for (i = 0; i < col; i++)
-		(void)fprintf(stderr, " ");
-	(void)fprintf(stderr, "^\n");
-
+	(void)fprintf(stderr, "%s:%d: error: %s (column %d)\n", 
+			p->name, line, lit, col);
 	return(0);
 }
 
@@ -451,24 +443,14 @@ static void
 msg_msg(void *arg, int line, int col, const char *msg)
 {
 	struct md_parse	 *p;
-	int		  i;
 
 	p = (struct md_parse *)arg;
 
 	if (p->dbg < 2)
 		return;
 
-	(void)printf("%s:%d: %s", p->name, line, msg);
-
-	if (p->dbg < 3) {
-		(void)printf(" (column %d)\n", col);
-		return;
-	}
-
-	(void)printf("\nFrom: %s\n      ", p->line);
-	for (i = 0; i < col; i++)
-		(void)printf(" ");
-	(void)printf("^\n");
+	(void)printf("%s:%d: %s (column %d)\n", 
+			p->name, line, msg, col);
 }
 
 
@@ -477,7 +459,6 @@ msg_warn(void *arg, int line, int col, enum mdoc_warn 
 {
 	char		 *lit;
 	struct md_parse	 *p;
-	int		  i;
 	extern char	 *__progname;
 
 	p = (struct md_parse *)arg;
@@ -501,8 +482,14 @@ msg_warn(void *arg, int line, int col, enum mdoc_warn 
 		lit = "syntax: argument-like value";
 		break;
 	case (WARN_SYNTAX_EMPTYBODY):
-		lit = "syntax: empty block-body section";
+		lit = "syntax: macro suggests non-empty block-body section";
 		break;
+	case (WARN_SYNTAX_EMPTYHEAD):
+		lit = "syntax: macro suggests non-empty block-head section";
+		break;
+	case (WARN_SYNTAX_NOBODY):
+		lit = "syntax: macro suggests empty block-body section";
+		break;
 	case (WARN_SEC_OO):
 		lit = "section is out of conventional order";
 		break;
@@ -533,15 +520,8 @@ msg_warn(void *arg, int line, int col, enum mdoc_warn 
 	}
 
 
-	(void)fprintf(stderr, "%s:%d: warning: %s", p->name, line, lit);
-
-	if (p->dbg >= 1) {
-		(void)fprintf(stderr, "\nFrom: %s\n      ", p->line);
-		for (i = 0; i < col; i++)
-			(void)fprintf(stderr, " ");
-		(void)fprintf(stderr, "^\n");
-	} else 
-		(void)fprintf(stderr, " (column %d)\n", col);
+	(void)fprintf(stderr, "%s:%d: warning: %s (column %d)\n", 
+			p->name, line, lit, col);
 
 	if (p->warn & MD_WARN_ERR) {
 		(void)fprintf(stderr, "%s: considering warnings as "