===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.26
retrieving revision 1.43
diff -u -p -r1.26 -r1.43
--- mandoc/Attic/mdocml.c	2008/12/28 21:25:09	1.26
+++ mandoc/Attic/mdocml.c	2009/01/15 15:59:19	1.43
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.26 2008/12/28 21:25:09 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);
@@ -57,7 +55,7 @@ static	int		 buf_leave(struct md_parse *, int);
 
 static	int		 msg_err(void *, int, int, enum mdoc_err);
 static	int		 msg_warn(void *, int, int, enum mdoc_warn);
-static	void		 msg_msg(void *, int, const char *);
+static	void		 msg_msg(void *, int, int, const char *);
 
 #ifdef __linux__
 extern	int		 getsubopt(char **, char *const *, char **);
@@ -192,37 +190,35 @@ 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";
-		params = n->data.head.args;
-		sz = n->data.head.sz;
+		p = mdoc_macronames[n->tok];
 		break;
+	case (MDOC_TAIL):
+		p = mdoc_macronames[n->tok];
+		break;
 	case (MDOC_ELEM):
-		assert(NULL == n->child);
-		p = mdoc_macronames[n->data.elem.tok];
-		t = "element";
+		p = mdoc_macronames[n->tok];
 		argv = n->data.elem.argv;
 		argc = n->data.elem.argc;
-		params = n->data.elem.args;
-		sz = n->data.elem.sz;
 		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";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -234,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);
@@ -255,11 +255,16 @@ parse_leave(struct md_parse *p, int code)
 {
 	const struct mdoc_node *n;
 
-	if (p->mdoc) {
-		if ((n = mdoc_result(p->mdoc)))
-			print_node(n, 0);
-		mdoc_free(p->mdoc);
-	}
+	if (NULL == p->mdoc)
+		return(code);
+
+	if ( ! mdoc_endparse(p->mdoc))
+		code = 0;
+	if ((n = mdoc_result(p->mdoc)))
+		print_node(n, 0);
+
+	mdoc_free(p->mdoc);
+
 	return(code);
 }
 
@@ -271,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;
@@ -279,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));
@@ -298,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, line))
+			if ( ! mdoc_parseln(p->mdoc, lnn, line))
 				return(parse_leave(p, 0));
 
-			p->lnn++;
+			lnn++;
 			pos = 0;
 		}
 	}
@@ -316,17 +319,19 @@ parse_begin(struct md_parse *p)
 
 
 static int
-msg_err(void *arg, int tok, int col, enum mdoc_err type)
+msg_err(void *arg, int line, int col, enum mdoc_err type)
 {
-	char		 *fmt, *lit;
+	char		 *lit;
 	struct md_parse	 *p;
-	int		  i;
 
 	p = (struct md_parse *)arg;
 
-	fmt = lit = NULL;
+	lit = NULL;
 
 	switch (type) {
+	case (ERR_SYNTAX_NOTEXT):
+		lit = "syntax: context-free text disallowed";
+		break;
 	case (ERR_SYNTAX_QUOTE):
 		lit = "syntax: disallowed argument quotation";
 		break;
@@ -337,44 +342,58 @@ msg_err(void *arg, int tok, int col, enum mdoc_err typ
 		lit = "syntax: whitespace in argument";
 		break;
 	case (ERR_SYNTAX_ARGFORM):
-		fmt = "syntax: macro `%s' arguments malformed";
+		lit = "syntax: macro arguments malformed";
 		break;
+	case (ERR_SYNTAX_NOPUNCT):
+		lit = "syntax: macro doesn't understand punctuation";
+		break;
 	case (ERR_SYNTAX_ARG):
-		fmt = "syntax: unknown argument for macro `%s'";
+		lit = "syntax: unknown argument for macro";
 		break;
 	case (ERR_SCOPE_BREAK):
-		/* Which scope is broken? */
-		fmt = "scope: macro `%s' breaks prior explicit scope";
+		lit = "scope: macro breaks prior scope";
 		break;
 	case (ERR_SCOPE_NOCTX):
-		fmt = "scope: closure macro `%s' has no context";
+		lit = "scope: closure macro has no context";
 		break;
 	case (ERR_SCOPE_NONEST):
-		fmt = "scope: macro `%s' may not be nested in the current context";
+		lit = "scope: macro may not be nested in the current context";
 		break;
 	case (ERR_MACRO_NOTSUP):
-		fmt = "macro `%s' not supported";
+		lit = "macro not supported";
 		break;
 	case (ERR_MACRO_NOTCALL):
-		fmt = "macro `%s' not callable";
+		lit = "macro not callable";
 		break;
 	case (ERR_SEC_PROLOGUE):
-		fmt = "macro `%s' cannot be called in the prologue";
+		lit = "macro cannot be called in the prologue";
 		break;
 	case (ERR_SEC_NPROLOGUE):
-		fmt = "macro `%s' called outside of prologue";
+		lit = "macro called outside of prologue";
 		break;
+	case (ERR_ARGS_EQ0):
+		lit = "macro expects zero arguments";
+		break;
+	case (ERR_ARGS_EQ1):
+		lit = "macro expects one argument";
+		break;
 	case (ERR_ARGS_GE1):
-		fmt = "macro `%s' expects one or more arguments";
+		lit = "macro expects one or more arguments";
 		break;
+	case (ERR_ARGS_LE2):
+		lit = "macro expects two or fewer arguments";
+		break;
+	case (ERR_ARGS_LE8):
+		lit = "macro expects eight or fewer arguments";
+		break;
 	case (ERR_ARGS_MANY):
-		fmt = "macro `%s' has too many arguments";
+		lit = "macro has too many arguments";
 		break;
 	case (ERR_SEC_PROLOGUE_OO):
-		fmt = "prologue macro `%s' is out-of-order";
+		lit = "prologue macro is out-of-order";
 		break;
 	case (ERR_SEC_PROLOGUE_REP):
-		fmt = "prologue macro `%s' repeated";
+		lit = "prologue macro repeated";
 		break;
 	case (ERR_SEC_NAME):
 		lit = "`NAME' section must be first";
@@ -383,77 +402,63 @@ msg_err(void *arg, int tok, int col, enum mdoc_err typ
 		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;
+	case (ERR_SYNTAX_CHILDBODY):
+		lit = "syntax: expected only a block-body section";
+		break;
+	case (ERR_SYNTAX_EMPTYHEAD):
+		lit = "syntax: block-header section may not be empty";
+		break;
+	case (ERR_SYNTAX_EMPTYBODY):
+		lit = "syntax: block-body section may not be empty";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	if (fmt) {
-		(void)fprintf(stderr, "%s:%d: error: ",
-				p->name, p->lnn);
-		(void)fprintf(stderr, fmt, mdoc_macronames[tok]);
-	} else
-		(void)fprintf(stderr, "%s:%d: error: %s",
-				p->name, p->lnn, lit);
-
-	if (p->dbg < 1) {
-		if (-1 != col)
-			(void)fprintf(stderr, " (column %d)\n", col);
-		return(0);
-	} else if (-1 == col) {
-		(void)fprintf(stderr, "\nFrom: %s", p->line);
-		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);
 }
 
 
 static void
-msg_msg(void *arg, int col, const char *msg)
+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, p->lnn, msg);
-
-	if (p->dbg < 3) {
-		if (-1 != col)
-			(void)printf(" (column %d)\n", col);
-		return;
-	} else if (-1 == col) {
-		(void)printf("\nFrom %s\n", p->line);
-		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);
 }
 
 
 static int
-msg_warn(void *arg, int tok, int col, enum mdoc_warn type)
+msg_warn(void *arg, int line, int col, enum mdoc_warn type)
 {
-	char		 *fmt, *lit;
+	char		 *lit;
 	struct md_parse	 *p;
-	int		  i;
 	extern char	 *__progname;
 
 	p = (struct md_parse *)arg;
@@ -461,7 +466,7 @@ msg_warn(void *arg, int tok, int col, enum mdoc_warn t
 	if ( ! (p->warn & MD_WARN_ALL))
 		return(1);
 
-	fmt = lit = NULL;
+	lit = NULL;
 
 	switch (type) {
 	case (WARN_SYNTAX_WS_EOLN):
@@ -476,41 +481,47 @@ msg_warn(void *arg, int tok, int col, enum mdoc_warn t
 	case (WARN_SYNTAX_ARGLIKE):
 		lit = "syntax: argument-like value";
 		break;
+	case (WARN_SYNTAX_EMPTYBODY):
+		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;
+	case (WARN_SEC_REP):
+		lit = "section repeated";
+		break;
 	case (WARN_ARGS_GE1):
-		fmt = "macro `%s' suggests one or more arguments";
+		lit = "macro suggests one or more arguments";
 		break;
 	case (WARN_ARGS_EQ0):
-		fmt = "macro `%s' suggests zero arguments";
+		lit = "macro suggests zero arguments";
 		break;
 	case (WARN_IGN_AFTER_BLK):
-		fmt = "ignore: macro `%s' ignored after block macro";
+		lit = "ignore: macro ignored after block macro";
 		break;
+	case (WARN_IGN_OBSOLETE):
+		lit = "ignore: macro is obsolete";
+		break;
 	case (WARN_IGN_BEFORE_BLK):
-		fmt = "ignore: macro before block macro `%s' ignored";
+		lit = "ignore: macro before block macro ignored";
 		break;
+	case (WARN_COMPAT_TROFF):
+		lit = "compat: macro behaves differently in troff and nroff";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	if (fmt) {
-		(void)fprintf(stderr, "%s:%d: warning: ",
-				p->name, p->lnn);
-		(void)fprintf(stderr, fmt, mdoc_macronames[tok]);
-	} else
-		(void)fprintf(stderr, "%s:%d: warning: %s",
-				p->name, p->lnn, 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 "