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.

8 files changed, 1341 insertions, 706 deletions

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..7c38320
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,4 @@
+grecs-gram.c
+grecs-gram.h
+grecs-gram.output
+grecs-lex.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 759716b..0c2c444 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,14 +16,17 @@
 
 noinst_LIBRARIES=libgrecs.a
 libgrecs_a_SOURCES = \
+ diag.c\
  format.c\
  grecs-gram.y\
  grecs-lex.l\
  list.c\
+ lookup.c\
  mem.c\
  preproc.c\
  symtab.c\
  text.c\
+ tree.c\
  grecs.h\
  wordsplit.c\
  wordsplit.h
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++;
+}
+
+
diff --git a/src/format.c b/src/format.c
index fc6c8d6..11b405a 100644
--- a/src/format.c
+++ b/src/format.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 const char *
-grecs_data_type_string (enum grecs_data_type type)
+grecs_data_type_string(enum grecs_data_type type)
 {
         switch (type) {
         case grecs_type_void:
@@ -68,14 +68,14 @@ grecs_data_type_string (enum grecs_data_type type)
 }
 
 static void
-format_level(FILE *stream, unsigned level)
+format_level(unsigned level, FILE *stream)
 {
         while (level--)
                 fprintf(stream, "  ");
 }
 
 void
-grecs_format_docstring(FILE *stream, const char *docstring, unsigned level)
+grecs_format_docstring(const char *docstring, unsigned level, FILE *stream)
 {
         size_t len = strlen(docstring);
         int width = 78 - level * 2;
@@ -101,7 +101,7 @@ grecs_format_docstring(FILE *stream, const char *docstring, unsigned level)
                 if (seglen == 0 || *p == 0)
                         seglen = p - docstring;
 
-                format_level(stream, level);
+                format_level(level, stream);
                 fprintf(stream, "# ");
                 fwrite(docstring, seglen, 1, stream);
                 fputc('\n', stream);
@@ -119,14 +119,14 @@ grecs_format_docstring(FILE *stream, const char *docstring, unsigned level)
 }
 
 void
-grecs_format_simple_statement(FILE *stream, struct grecs_keyword *kwp,
-                              unsigned level)
+grecs_format_simple_statement(struct grecs_keyword *kwp, unsigned level,
+                              FILE *stream)
 {
         const char *argstr;
         
         if (kwp->docstring)
-                grecs_format_docstring(stream, kwp->docstring, level);
-        format_level(stream, level);
+                grecs_format_docstring(kwp->docstring, level, stream);
+        format_level(level, stream);
 
         if (kwp->argname)
                 argstr = kwp->argname;
@@ -136,7 +136,7 @@ grecs_format_simple_statement(FILE *stream, struct grecs_keyword *kwp,
         if (strchr("<[", argstr[0]))
                 fprintf(stream, "%s %s;\n", kwp->ident, gettext(argstr));
         else if (strchr (argstr, ':'))
-                fprintf (stream, "%s <%s>;\n", kwp->ident, gettext(argstr));
+                fprintf(stream, "%s <%s>;\n", kwp->ident, gettext(argstr));
         else {
                 fprintf(stream, "%s <%s: ", kwp->ident, gettext(argstr));
                 if (GRECS_IS_LIST(kwp->type))
@@ -151,34 +151,117 @@ grecs_format_simple_statement(FILE *stream, struct grecs_keyword *kwp,
 }
 
 void
-grecs_format_block_statement(FILE *stream, struct grecs_keyword *kwp,
-                             unsigned level)
+grecs_format_block_statement(struct grecs_keyword *kwp, unsigned level,
+                             FILE *stream)
 {
         if (kwp->docstring)
-                grecs_format_docstring(stream, kwp->docstring, level);
-        format_level(stream, level);
+                grecs_format_docstring(kwp->docstring, level, stream);
+        format_level(level, stream);
         fprintf(stream, "%s", kwp->ident);
         if (kwp->argname)
                 fprintf(stream, " <%s>", gettext(kwp->argname));
         fprintf(stream, " {\n");
-        grecs_format_statement_array(stream, kwp->kwd, 0, level + 1);
-        format_level(stream, level);
+        grecs_format_statement_array(kwp->kwd, 0, level + 1, stream);
+        format_level(level, stream);
         fprintf(stream, "}\n");
 }
 
 void
-grecs_format_statement_array(FILE *stream, struct grecs_keyword *kwp,
+grecs_format_statement_array(struct grecs_keyword *kwp,
                              unsigned n,
-                             unsigned level)
+                             unsigned level,
+                             FILE *stream)
 {
         for (; kwp->ident; kwp++, n++) {
                 if (n)
                         fputc('\n', stream);
                 if (kwp->type == grecs_type_section)
-                        grecs_format_block_statement(stream, kwp, level);
+                        grecs_format_block_statement(kwp, level, stream);