Switch to the two-layer model. Add testsuite.

The configuration file parser creates a syntax tree.  This step
does not require any knowledge about which keywords are allowed.
The user can then either use that tree directly, or post-process
it using parser tables.  The latter approach is equivalent to
previous versions of grecs.

1 files changed, 73 insertions, 0 deletions

diff --git a/src/diag.c b/src/diag.c
new file mode 100644
index 0000000..fcb8fd2
--- /dev/null
+++ b/src/diag.c
@@ -0,0 +1,73 @@
+/* grecs - Gray's Extensible Configuration System
+   Copyright (C) 2007-2011 Sergey Poznyakoff
+
+   Grecs is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 3 of the License, or (at your
+   option) any later version.
+
+   Grecs is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with Grecs. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <grecs.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+static void
+default_print_diag(grecs_locus_t *locus, int err, int errcode, const char *msg)
+{
+	if (locus)
+		fprintf(stderr, "%s:%d: ", locus->file, locus->line);
+	if (!err)
+		fprintf(stderr, "warning: ");
+	fprintf(stderr, "%s", msg);
+	if (errcode)
+		fprintf(stderr, ": %s", strerror(errno));
+	fputc('\n', stderr);
+}
+
+void (*grecs_print_diag_fun)(grecs_locus_t *, int, int, const char *msg) =
+	default_print_diag;
+
+void
+grecs_warning(grecs_locus_t *locus, int errcode, const char *fmt, ...)
+{
+	va_list ap;
+	char *buf = NULL;
+	size_t size = 0;
+	
+	va_start(ap, fmt);
+	if (grecs_vasprintf(&buf, &size, fmt, ap))
+		grecs_alloc_die();
+	va_end(ap);
+	grecs_print_diag_fun(locus, 0, errcode, buf);
+	free(buf);
+}    
+
+void
+grecs_error(grecs_locus_t *locus, int errcode, const char *fmt, ...)
+{
+	va_list ap;
+	char *buf = NULL;
+	size_t size = 0;
+	
+	va_start(ap, fmt);
+	if (grecs_vasprintf(&buf, &size, fmt, ap))
+		grecs_alloc_die();
+	va_end(ap);
+	grecs_print_diag_fun(locus, 1, errcode, buf);
+	free(buf);
+	grecs_error_count++;
+}
+
+