===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.2
retrieving revision 1.26
diff -u -p -r1.2 -r1.26
--- mandoc/Attic/mdocml.c	2008/11/22 16:55:02	1.2
+++ mandoc/Attic/mdocml.c	2008/12/28 21:25:09	1.26
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.2 2008/11/22 16:55:02 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.26 2008/12/28 21:25:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,347 +16,509 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #include <assert.h>
-#include <err.h>
 #include <fcntl.h>
+#include <err.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "libmdocml.h"
+#include "mdoc.h"
 
-struct md_file {
-	int		 fd;
-	const char	*name;
-};
+#define	MD_LINE_SZ	(256)
 
-struct md_buf {
-	struct md_file	*file;
+struct	md_parse {
+	int		 warn;
+#define	MD_WARN_ALL	(1 << 0)
+#define	MD_WARN_ERR	(1 << 1)
+	int		 dbg;
+	struct mdoc	*mdoc;
 	char		*buf;
-	size_t		 bufsz;
-	size_t		 line;
+	u_long		 bufsz;
+	char		*name;
+	int		 fd;
+	int		 lnn;
+	char		*line;
 };
 
-struct md_mbuf {
-	struct md_buf	*buf;
-	size_t		 pos;
-};
+static	void		 usage(void);
 
-static void		 usage(void);
+static	int		 parse_begin(struct md_parse *);
+static	int		 parse_leave(struct md_parse *, int);
+static	int		 io_begin(struct md_parse *);
+static	int		 io_leave(struct md_parse *, int);
+static	int		 buf_begin(struct md_parse *);
+static	int		 buf_leave(struct md_parse *, int);
 
-static int		 md_begin(const char *, const char *);
-static int		 md_begin_io(const char *, const char *);
-static int		 md_begin_bufs(struct md_file *, struct md_file *);
-static int		 md_run(struct md_buf *, struct md_buf *);
-static int		 md_line(struct md_mbuf *, const struct md_buf *,
-				const char *, size_t);
+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 ssize_t		 md_buf_fill(struct md_buf *);
-static int		 md_buf_flush(struct md_mbuf *);
+#ifdef __linux__
+extern	int		 getsubopt(char **, char *const *, char **);
+#endif
 
-static int		 md_buf_putchar(struct md_mbuf *, char);
-static int		 md_buf_puts(struct md_mbuf *, 
-				const char *, size_t);
-
-
 int
 main(int argc, char *argv[])
 {
 	int		 c;
-	char		*out, *in;
+	struct md_parse	 parser;
+	char		*opts, *v;
+#define ALL     	 0
+#define ERROR     	 1
+	char		*toks[] = { "all", "error", NULL };
 
 	extern char	*optarg;
 	extern int	 optind;
 
-	out = NULL;
-	
-	while (-1 != (c = getopt(argc, argv, "o:")))
+	(void)memset(&parser, 0, sizeof(struct md_parse));
+
+	while (-1 != (c = getopt(argc, argv, "vW:")))
 		switch (c) {
-		case ('o'):
-			out = optarg;
+		case ('v'):
+			parser.dbg++;
 			break;
+		case ('W'):
+			opts = optarg;
+			while (*opts) 
+				switch (getsubopt(&opts, toks, &v)) {
+				case (ALL):
+					parser.warn |= MD_WARN_ALL;
+					break;
+				case (ERROR):
+					parser.warn |= MD_WARN_ERR;
+					break;
+				default:
+					usage();
+					return(1);
+				}
+			break;
 		default:
 			usage();
 			return(1);
 		}
 
 	argv += optind;
-	if (1 != (argc -= optind)) {
-		usage();
-		return(1);
-	}
+	argc -= optind;
 
-	argc--;
-	in = *argv++;
+	parser.name = "-";
+	if (1 == argc)
+		parser.name = *argv++;
 
-	return(md_begin(out, in));
+	if ( ! io_begin(&parser))
+		return(EXIT_FAILURE);
+
+	return(EXIT_SUCCESS);
 }
 
 
 static int
-md_begin(const char *out, const char *in)
+io_leave(struct md_parse *p, int code)
 {
-	char		 buf[MAXPATHLEN];
 
-	assert(in);
-	if (out)
-		return(md_begin_io(out, in));
+	if (-1 == p->fd || STDIN_FILENO == p->fd)
+		return(code);
 
-	if (strlcpy(buf, in, MAXPATHLEN) >= MAXPATHLEN)
-		warnx("output filename too long");
-	else if (strlcat(buf, ".html", MAXPATHLEN) >= MAXPATHLEN)
-		warnx("output filename too long");
-	else 
-		return(md_begin_io(buf, in));
-
-	return(1);
+	if (-1 == close(p->fd)) {
+		warn("%s", p->name);
+		code = 0;
+	}
+	return(code);
 }
 
 
 static int
-md_begin_io(const char *out, const char *in)
+io_begin(struct md_parse *p)
 {
-	int		 c;
-	struct md_file	 fin, fout;
 
-	assert(out);
-	assert(in);
+	p->fd = STDIN_FILENO;
+	if (0 != strncmp(p->name, "-", 1))
+		if (-1 == (p->fd = open(p->name, O_RDONLY, 0))) {
+			warn("%s", p->name);
+			return(io_leave(p, 0));
+		}
 
-	/* TODO: accept "-" as both input and output. */
+	return(io_leave(p, buf_begin(p)));
+}
 
-	fin.name = in;
 
-	if (-1 == (fin.fd = open(fin.name, O_RDONLY, 0))) {
-		warn("%s", fin.name);
-		return(1);
-	}
+static int
+buf_leave(struct md_parse *p, int code)
+{
 
-	fout.name = out;
+	if (p->buf)
+		free(p->buf);
+	return(code);
+}
 
-	fout.fd = open(fout.name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (-1 == fout.fd) {
-		warn("%s", fout.name);
-		if (-1 == close(fin.fd))
-			warn("%s", fin.name);
+
+static int
+buf_begin(struct md_parse *p)
+{
+	struct stat	 st;
+
+	if (-1 == fstat(p->fd, &st)) {
+		warn("%s", p->name);
 		return(1);
-	}
+	} 
 
-	c = md_begin_bufs(&fout, &fin);
+	p->bufsz = MAX(st.st_blksize, BUFSIZ);
 
-	if (-1 == close(fin.fd)) {
-		warn("%s", in);
-		c = 1;
+	if (NULL == (p->buf = malloc(p->bufsz))) {
+		warn("malloc");
+		return(buf_leave(p, 0));
 	}
-	if (-1 == close(fout.fd)) {
-		warn("%s", out);
-		c = 1;
-	}
 
-	return(c);
+	return(buf_leave(p, parse_begin(p)));
 }
 
 
-static int
-md_begin_bufs(struct md_file *out, struct md_file *in)
+static void
+print_node(const struct mdoc_node *n, int indent)
 {
-	struct stat	 stin, stout;
-	struct md_buf	 inbuf, outbuf;
-	int		 c;
+	const char	 *p, *t;
+	int		  i, j;
+	size_t		  argc, sz;
+	char		**params;
+	struct mdoc_arg	 *argv;
 
-	assert(in);
-	assert(out);
+	argv = NULL;
+	argc = 0;
+	params = NULL;
+	sz = 0;
 
-	if (-1 == fstat(in->fd, &stin)) {
-		warn("fstat: %s", in->name);
-		return(1);
-	} else if (-1 == fstat(out->fd, &stout)) {
-		warn("fstat: %s", out->name);
-		return(1);
+	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";
+		break;
+	case (MDOC_HEAD):
+		p = mdoc_macronames[n->data.head.tok];
+		t = "block-head";
+		params = n->data.head.args;
+		sz = n->data.head.sz;
+		break;
+	case (MDOC_ELEM):
+		assert(NULL == n->child);
+		p = mdoc_macronames[n->data.elem.tok];
+		t = "element";
+		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";
+		argv = n->data.block.argv;
+		argc = n->data.block.argc;
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
 	}
 
-	inbuf.file = in;
-	inbuf.line = 1;
-	/*inbuf.bufsz = MAX(stin.st_blksize, BUFSIZ);*/
-	inbuf.bufsz = 256;
+	for (i = 0; i < indent; i++)
+		(void)printf("    ");
+	(void)printf("%s (%s)", p, t);
 
-	outbuf.file = out;
-	outbuf.line = 1;
-	/*outbuf.bufsz = MAX(stout.st_blksize, BUFSIZ);*/
-	outbuf.bufsz = 256;
-
-	if (NULL == (inbuf.buf = malloc(inbuf.bufsz))) {
-		warn("malloc");
-		return(1);
-	} else if (NULL == (outbuf.buf = malloc(outbuf.bufsz))) {
-		warn("malloc");
-		free(inbuf.buf);
-		return(1);
+	for (i = 0; i < (int)argc; i++) {
+		(void)printf(" -%s", mdoc_argnames[argv[i].arg]);
+		for (j = 0; j < (int)argv[i].sz; j++)
+			(void)printf(" \"%s\"", argv[i].value[j]);
 	}
 
-	c = md_run(&outbuf, &inbuf);
+	for (i = 0; i < (int)sz; i++)
+		(void)printf(" \"%s\"", params[i]);
 
-	free(inbuf.buf);
-	free(outbuf.buf);
+	(void)printf("\n");
 
-	return(c);
+	if (n->child)
+		print_node(n->child, indent + 1);
+	if (n->next)
+		print_node(n->next, indent);
 }
 
 
-static ssize_t
-md_buf_fill(struct md_buf *in)
+static int
+parse_leave(struct md_parse *p, int code)
 {
-	ssize_t		 ssz;
+	const struct mdoc_node *n;
 
-	assert(in);
-	assert(in->file);
-	assert(in->buf);
-	assert(in->bufsz > 0);
-	assert(in->file->name);
-
-	if (-1 == (ssz = read(in->file->fd, in->buf, in->bufsz))) 
-		warn("%s", in->file->name);
-	else
-		(void)printf("%s: filled %zd bytes\n",
-				in->file->name, ssz);
-
-	return(ssz);
+	if (p->mdoc) {
+		if ((n = mdoc_result(p->mdoc)))
+			print_node(n, 0);
+		mdoc_free(p->mdoc);
+	}
+	return(code);
 }
 
 
 static int
-md_run(struct md_buf *out, struct md_buf *in)
+parse_begin(struct md_parse *p)
 {
-	struct md_mbuf	 mbuf;
 	ssize_t		 sz, i;
-	char		 line[BUFSIZ];
 	size_t		 pos;
+	char		 line[256], sv[256];
+	struct mdoc_cb	 cb;
 
-	assert(in);
-	assert(out); 
+	cb.mdoc_err = msg_err;
+	cb.mdoc_warn = msg_warn;
+	cb.mdoc_msg = msg_msg;
 
-	mbuf.buf = out;
-	mbuf.pos = 0;
+	if (NULL == (p->mdoc = mdoc_alloc(p, &cb)))
+		return(parse_leave(p, 0));
 
-	/* LINTED */
+	p->lnn = 1;
+	p->line = sv;
+
 	for (pos = 0; ; ) {
-		if (-1 == (sz = md_buf_fill(in)))
-			return(1);
-		else if (0 == sz)
+		if (-1 == (sz = read(p->fd, p->buf, p->bufsz))) {
+			warn("%s", p->name);
+			return(parse_leave(p, 0));
+		} else if (0 == sz) 
 			break;
 
 		for (i = 0; i < sz; i++) {
-			if ('\n' == in->buf[i]) {
-				if (md_line(&mbuf, in, line, pos))
-					return(1);
-				in->line++;
-				pos = 0;
-				continue;
+			if ('\n' != p->buf[i]) {
+				if (pos < sizeof(line)) {
+					sv[(int)pos] = p->buf[(int)i];
+					line[(int)pos++] = 
+						p->buf[(int)i];
+					continue;
+				}
+				warnx("%s: line %d too long", 
+						p->name, p->lnn);
+				return(parse_leave(p, 0));
 			}
+	
+			line[(int)pos] = sv[(int)pos] = 0;
+			if ( ! mdoc_parseln(p->mdoc, line))
+				return(parse_leave(p, 0));
 
-			if (pos < BUFSIZ) {
-				/* LINTED */
-				line[pos++] = in->buf[i];
-				continue;
-			}
-
-			warnx("%s: line %zu too long",
-					in->file->name, in->line);
-			return(1);
+			p->lnn++;
+			pos = 0;
 		}
 	}
 
-	if (0 != pos && md_line(&mbuf, in, line, pos))
-		return(1);
-
-	return(md_buf_flush(&mbuf) ? 0 : 1);
+	return(parse_leave(p, 1));
 }
 
 
 static int
-md_buf_flush(struct md_mbuf *buf)
+msg_err(void *arg, int tok, int col, enum mdoc_err type)
 {
-	ssize_t		 sz;
+	char		 *fmt, *lit;
+	struct md_parse	 *p;
+	int		  i;
 
-	assert(buf);
-	assert(buf->buf);
-	assert(buf->buf->file);
-	assert(buf->buf->buf);
-	assert(buf->buf->file->name);
+	p = (struct md_parse *)arg;
 
-	(void)printf("%s: flushing %zu bytes\n",
-			buf->buf->file->name, buf->pos);
+	fmt = lit = NULL;
 
-	if (0 == buf->pos)
-		return(1);
+	switch (type) {
+	case (ERR_SYNTAX_QUOTE):
+		lit = "syntax: disallowed argument quotation";
+		break;
+	case (ERR_SYNTAX_UNQUOTE):
+		lit = "syntax: unterminated quotation";
+		break;
+	case (ERR_SYNTAX_WS):
+		lit = "syntax: whitespace in argument";
+		break;
+	case (ERR_SYNTAX_ARGFORM):
+		fmt = "syntax: macro `%s' arguments malformed";
+		break;
+	case (ERR_SYNTAX_ARG):
+		fmt = "syntax: unknown argument for macro `%s'";
+		break;
+	case (ERR_SCOPE_BREAK):
+		/* Which scope is broken? */
+		fmt = "scope: macro `%s' breaks prior explicit scope";
+		break;
+	case (ERR_SCOPE_NOCTX):
+		fmt = "scope: closure macro `%s' has no context";
+		break;
+	case (ERR_SCOPE_NONEST):
+		fmt = "scope: macro `%s' may not be nested in the current context";
+		break;
+	case (ERR_MACRO_NOTSUP):
+		fmt = "macro `%s' not supported";
+		break;
+	case (ERR_MACRO_NOTCALL):
+		fmt = "macro `%s' not callable";
+		break;
+	case (ERR_SEC_PROLOGUE):
+		fmt = "macro `%s' cannot be called in the prologue";
+		break;
+	case (ERR_SEC_NPROLOGUE):
+		fmt = "macro `%s' called outside of prologue";
+		break;
+	case (ERR_ARGS_GE1):
+		fmt = "macro `%s' expects one or more arguments";
+		break;
+	case (ERR_ARGS_MANY):
+		fmt = "macro `%s' has too many arguments";
+		break;
+	case (ERR_SEC_PROLOGUE_OO):
+		fmt = "prologue macro `%s' is out-of-order";
+		break;
+	case (ERR_SEC_PROLOGUE_REP):
+		fmt = "prologue macro `%s' repeated";
+		break;
+	case (ERR_SEC_NAME):
+		lit = "`NAME' section must be first";
+		break;
+	case (ERR_SYNTAX_ARGVAL):
+		lit = "syntax: expected value for macro argument";
+		break;
+	case (ERR_SYNTAX_ARGBAD):
+		lit = "syntax: invalid value for macro argument";
+		break;
+	case (ERR_SYNTAX_ARGMANY):
+		lit = "syntax: too many values for macro argument";
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
 
-	sz = write(buf->buf->file->fd, buf->buf->buf, buf->pos);
+	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 (-1 == sz) {
-		warn("%s", buf->buf->file->name);
+	if (p->dbg < 1) {
+		if (-1 != col)
+			(void)fprintf(stderr, " (column %d)\n", col);
 		return(0);
-	} else if ((size_t)sz != buf->pos) {
-		warnx("%s: short write", buf->buf->file->name);
+	} else if (-1 == col) {
+		(void)fprintf(stderr, "\nFrom: %s", p->line);
 		return(0);
 	}
 
-	buf->pos = 0;
-	return(1);
-}
+	(void)fprintf(stderr, "\nFrom: %s\n      ", p->line);
+	for (i = 0; i < col; i++)
+		(void)fprintf(stderr, " ");
+	(void)fprintf(stderr, "^\n");
 
-
-static int
-md_buf_putchar(struct md_mbuf *buf, char c)
-{
-	return(md_buf_puts(buf, &c, 1));
+	return(0);
 }
 
 
-static int
-md_buf_puts(struct md_mbuf *buf, const char *p, size_t sz)
+static void
+msg_msg(void *arg, int col, const char *msg)
 {
-	size_t		 ssz;
+	struct md_parse	 *p;
+	int		  i;
 
-	assert(p);
-	assert(buf);
-	assert(buf->buf);
+	p = (struct md_parse *)arg;
 
-	while (buf->pos + sz > buf->buf->bufsz) {
-		ssz = buf->buf->bufsz - buf->pos;
-		(void)memcpy(buf->buf->buf + buf->pos, p, ssz);
-		p += ssz;
-		sz -= ssz;
-		buf->pos += ssz;
+	if (p->dbg < 2)
+		return;
 
-		if ( ! md_buf_flush(buf))
-			return(0);
+	(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)memcpy(buf->buf->buf + buf->pos, p, sz);
-	buf->pos += sz;
-	return(1);
+	(void)printf("\nFrom: %s\n      ", p->line);
+	for (i = 0; i < col; i++)
+		(void)printf(" ");
+	(void)printf("^\n");
 }
 
 
 static int
-md_line(struct md_mbuf *out, const struct md_buf *in,
-		const char *buf, size_t sz)
+msg_warn(void *arg, int tok, int col, enum mdoc_warn type)
 {
+	char		 *fmt, *lit;
+	struct md_parse	 *p;
+	int		  i;
+	extern char	 *__progname;
 
-	assert(buf);
-	assert(out);
-	assert(in);
+	p = (struct md_parse *)arg;
 
-	if ( ! md_buf_puts(out, buf, sz))
+	if ( ! (p->warn & MD_WARN_ALL))
 		return(1);
-	if ( ! md_buf_putchar(out, '\n'))
-		return(1);
 
-	return(0);
+	fmt = lit = NULL;
+
+	switch (type) {
+	case (WARN_SYNTAX_WS_EOLN):
+		lit = "syntax: whitespace at end-of-line";
+		break;
+	case (WARN_SYNTAX_QUOTED):
+		lit = "syntax: quotation mark starting string";
+		break;
+	case (WARN_SYNTAX_MACLIKE):
+		lit = "syntax: macro-like argument";
+		break;
+	case (WARN_SYNTAX_ARGLIKE):
+		lit = "syntax: argument-like value";
+		break;
+	case (WARN_SEC_OO):
+		lit = "section is out of conventional order";
+		break;
+	case (WARN_ARGS_GE1):
+		fmt = "macro `%s' suggests one or more arguments";
+		break;
+	case (WARN_ARGS_EQ0):
+		fmt = "macro `%s' suggests zero arguments";
+		break;
+	case (WARN_IGN_AFTER_BLK):
+		fmt = "ignore: macro `%s' ignored after block macro";
+		break;
+	case (WARN_IGN_BEFORE_BLK):
+		fmt = "ignore: macro before block macro `%s' ignored";
+		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);
+
+	if (p->warn & MD_WARN_ERR) {
+		(void)fprintf(stderr, "%s: considering warnings as "
+				"errors\n", __progname);
+		return(0);
+	}
+
+	return(1);
 }
 
 
@@ -365,5 +527,7 @@ usage(void)
 {
 	extern char	*__progname;
 
-	(void)printf("usage: %s [-o outfile] infile\n", __progname);
+	(void)fprintf(stderr, "usage: %s [-v] [-Wwarn...] [infile]\n",
+			__progname);
 }
+