1 files changed, 38 insertions, 671 deletions

diff --git a/src/grecs-gram.y b/src/grecs-gram.y
index f65e2dd..c2429a4 100644
--- a/src/grecs-gram.y
+++ b/src/grecs-gram.y
@@ -22,45 +22,22 @@
 #include <grecs-gram.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <string.h>
 #include <errno.h>
   
-typedef union
-{
-  struct sockaddr s;
-  struct sockaddr_in s_in;
-  struct sockaddr_un s_un;
-} sockaddr_union_t;
-
-static struct grecs_keyword config_keywords;
-static struct grecs_keyword *cursect;
-#define CURRENT_BASE ((char*)(cursect ? cursect->callback_data : NULL))
-static struct grecs_list *sections;
+static struct grecs_node *parse_tree;
 int grecs_error_count;    
 
 int grecs_default_port = 0;
 
-static void *target_ptr(struct grecs_keyword *kwp, char *base);
-static void stmt_begin(struct grecs_keyword *kwp, grecs_value_t tag);
-static void stmt_end(struct grecs_keyword *kwp);
-static struct grecs_keyword *find_keyword(const char *ident);
-
-static void process_ident(struct grecs_keyword *kwp, grecs_value_t *value);
-static struct grecs_list *simple_list_create(int dispose);
 %}
 
 %union {
         char *string;
         grecs_value_t value;
         struct grecs_list *list;
-  struct grecs_keyword *kw;
+        struct grecs_node *node;
+        struct { struct grecs_node *head, *tail; } node_list;
 }
 
 %token <string> IDENT STRING QSTRING MSTRING
@@ -68,39 +45,47 @@ static struct grecs_list *simple_list_create(int dispose);
 %type <list> slist0
 %type <value> value tag vallist
 %type <list> values list vlist
-%type <kw> ident
+%type <node> stmt simple block
+%type <node_list> stmtlist
 
 %%
 
 input   : stmtlist
+          {
+                  parse_tree = $1.head;
+          }
         ;
 
 stmtlist: stmt
+          {
+                  $$.head = $$.tail = $1;
+          } 
         | stmtlist stmt
+          {
+                  grecs_node_bind($1.tail, $2, 0);
+          }
         ;
 
 stmt    : simple
         | block
         ;
 
-simple  : ident vallist ';'
-          {
-                  process_ident($1, &$2);
-          }
-        ;
-
-block   : ident tag { stmt_begin($<kw>1, $<value>2); } '{' stmtlist '}' opt_sc
+simple  : IDENT vallist ';'
           {
-                  stmt_end($1);
+                  $$ = grecs_node_create(grecs_node_stmt,
+                                         &grecs_current_locus);
+                  $$->ident = $1;
+                  $$->value = $2;
           }
         ;
 
-ident   : IDENT
+block   : IDENT tag '{' stmtlist '}' opt_sc
           {
-                  $$ = find_keyword($1);
-                  if (!$$) 
-                          grecs_error(&grecs_current_locus, 0,
-                                      _("Unknown keyword"));
+                  $$ = grecs_node_create(grecs_node_block,
+                                         &grecs_current_locus);
+                  $$->ident = $1;
+                  $$->value = $2;
+                  grecs_node_bind($$, $4.head, 1);
           }
         ;
 
@@ -135,7 +120,7 @@ vallist : vlist
 
 vlist   : value
           {
-                  $$ = simple_list_create(0);
+                  $$ = _grecs_simple_list_create(0);
                   grecs_list_append($$, grecs_value_dup(&$1));
           }
         | vlist value
@@ -169,7 +154,6 @@ string  : STRING
 slist   : slist0
           {
                   struct grecs_list_entry *ep;
-                  const void *p;
                   
                   grecs_line_begin();
                   for (ep = $1->head; ep; ep = ep->next)
@@ -181,7 +165,7 @@ slist   : slist0
 
 slist0  : QSTRING 
           {
-                  $$ = simple_list_create(0);
+                  $$ = _grecs_simple_list_create(0);
                   grecs_list_append($$, $1);
           }
         | slist0 QSTRING
@@ -207,7 +191,7 @@ list    : '(' ')'
 
 values  : value
           {
-                  $$ = simple_list_create(0);
+                  $$ = _grecs_simple_list_create(0);
                   grecs_list_append($$, grecs_value_dup(&$1));
           }
         | values ',' value
@@ -236,8 +220,8 @@ listel_dispose(void *el)
         free(el);
 }
  
-static struct grecs_list *
-simple_list_create(int dispose)
+struct grecs_list *
+_grecs_simple_list_create(int dispose)
 {
         struct grecs_list *lp = grecs_list_create();
         if (dispose)
@@ -307,59 +291,20 @@ grecs_asprintf(char **pbuf, size_t *psize, const char *fmt, ...)
         return rc;
 }
 
-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(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(locus, 1, errcode, buf);
-        free(buf);
-        grecs_error_count++;
-}
-
-void
-grecs_set_keywords(struct grecs_keyword *kwd)
-{
-        config_keywords.kwd = kwd;
-}
-
-int
+struct grecs_node *
 grecs_parse(const char *name)
 {
         int rc;
         if (grecs_lex_begin(name))
-                return 1;
-        cursect = &config_keywords;
-        if (sections) {
-                grecs_list_free(sections);
-                sections = NULL;
-        }
+                return NULL;
+        parse_tree = NULL;
         rc = yyparse();
         grecs_lex_end();
-        if (grecs_error_count)
-                rc = 1;
-        return rc;
+        if (grecs_error_count) {
+                grecs_tree_free(parse_tree);
+                parse_tree = NULL;