28 files changed, 2318 insertions, 716 deletions

diff --git a/.gitignore b/.gitignore
index 42c88b2..eec45d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,25 @@
-gconf-gram.c
-gconf-gram.h
-gconf-gram.output
-gconf-lex.c
+*.a
+*.o
+*.tar.*
+*~
+.deps
+.emacs.desktop
+.emacs.desktop.lock
+.emacsrc
+ABOUT-NLS
+ChangeLog
+INSTALL
+Makefile
+Makefile.in
+TAGS
+aclocal.m4
+autom4te.cache
+build-aux
+config.h
+config.h.in
+config.log
+config.status
+configure
+core
+m4
+stamp-h1
diff --git a/Makefile.am b/Makefile.am
index 1bfdcf4..17f1ff6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS=src
+SUBDIRS=src @GRECS_TESTDIR@
diff --git a/am/grecs.m4 b/am/grecs.m4
index 47c9867..5fc1819 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -49,14 +49,15 @@ AC_DEFUN([_GRECS_OPTION_SWITCH],
 AC_DEFUN([_GRECS_SET_OPTIONS],
 [m4_foreach_w([_GRECS_Option], [$1], [_GRECS_SET_OPTION(_GRECS_Option)])])
 
-# GRECS_SETUP([OPTIONS],[pp-setup-file])
-#
-# Options are:
+# GRECS_SETUP([dir],[OPTIONS],[pp-setup-file])
+# dir - Directory in the source tree where grecs has been cloned.
+# OPTIONS are:
 #   no-preproc         Disable the use of preprocessor.
 #   std-pp-setup       Install standard pp-setup file.
 #   pp-setup-option    Add the --with-pp-setup-file option to the
 #                      configuration file.  The option allows user to
 #                      control whether the pp-setup file is installed.
+#   tests              Build tests.
 #
 # The pp-setup-file argument supplies the pathname of the preprocessor
 # setup file in the source tree.  It is ignored if std-pp-setup option is
@@ -69,7 +70,8 @@ AC_DEFUN([GRECS_SETUP],[
   AC_PROG_YACC
   AM_PROG_LEX
 
-  _GRECS_SET_OPTIONS([$1])
+  AC_SUBST([GRECS_SUBDIR],m4_if([$1],,grecs,$1))
+  _GRECS_SET_OPTIONS([$2])
   # **********************      
   # Preprocessor
   # **********************
@@ -104,7 +106,7 @@ AC_DEFUN([GRECS_SETUP],[
       DEFAULT_PREPROCESSOR="$DEFAULT_PREPROCESSOR $PREPROC_OPTIONS"
       _GRECS_IF_OPTION_SET([std-pp-setup],
         [PP_SETUP_FILE='pp-setup'],
-        [m4_if([$2],,[PP_SETUP_FILE=],[PP_SETUP_FILE='$2'])])
+        [m4_if([$3],,[PP_SETUP_FILE=],[PP_SETUP_FILE='$3'])])
       AC_SUBST(PP_SETUP_FILE)
       if test -n "$PP_SETUP_FILE"; then
         _GRECS_IF_OPTION_SET([pp-setup-option],
@@ -127,5 +129,14 @@ AC_DEFUN([GRECS_SETUP],[
   else
     DEFAULT_PREPROCESSOR=NULL
   fi
+  _GRECS_IF_OPTION_SET([tests],
+                       [m4_pushdef([TESTDIR],m4_if([$1],,grecs,$1)/tests)
+                        AC_CONFIG_TESTDIR(TESTDIR)
+                        AC_CONFIG_FILES(TESTDIR/Makefile TESTDIR/atlocal)
+                        m4_popdef([TESTDIR])
+                        AM_MISSING_PROG([AUTOM4TE], [autom4te])
+                        GRECS_TESTDIR=tests
+                       ])
   AC_SUBST([GRECS_INCLUDES])
+  AC_SUBST([GRECS_TESTDIR])
 ])
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)