1 files changed, 22 insertions, 25 deletions

diff --git a/src/meta1gram.y b/src/meta1gram.y
index 6256448..deaf382 100644
--- a/src/meta1gram.y
+++ b/src/meta1gram.y
@@ -2,3 +2,3 @@
 /* MeTA1 configuration parser for GNU Pies.
-   Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff
+   Copyright (C) 2008, 2009, 2010, 2011 Sergey Poznyakoff
 
@@ -22,4 +22,6 @@
 #include "pies.h"
+#include "grecs-locus.h"
 #include "meta1lex.h"
-
+#include "meta1gram.h"
+  
 #define META1_QUEUE_DIR() \
@@ -53,3 +55,3 @@ meta1_stmt_create (enum meta1_stmt_type type, const char *ident)
   p->ident = ident;
-  p->locus = meta1_locus;
+  p->locus = meta1lloc;
   return p;
@@ -86,5 +88,8 @@ static void meta1_translate (struct meta1_stmt *);
 
+%error-verbose
+%locations
+
 %union {
   char *string;
-  gl_list_t list;
+  struct grecs_list *list;
   grecs_value_t *value;
@@ -170,9 +175,9 @@ string  : META1_IDENT
           {
-            const void *p;
-            gl_list_iterator_t itr = gl_list_iterator ($1);
-
+            struct grecs_list_entry *ep;
             meta1_line_begin ();
-            while (gl_list_iterator_next (&itr, &p, NULL))
-              meta1_line_add (p, strlen (p));
-            gl_list_iterator_free (&itr);
+            for (ep = $1->head; ep; ep = ep->next)
+              {
+                const char *p = ep->data;
+                meta1_line_add (p, strlen (p));
+              }
             $$ = meta1_line_finish ();
@@ -183,8 +188,4 @@ slist   : META1_STRING
           {
-            $$ = gl_list_create_empty (&gl_linked_list_implementation,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       true);
-            gl_list_add_last ($$, $1);
+            $$ = grecs_list_create ();
+            grecs_list_append ($$, $1);
           }
@@ -192,3 +193,3 @@ slist   : META1_STRING
           {
-            gl_list_add_last ($1, $2);
+            grecs_list_append ($1, $2);
             $$ = $1;
@@ -209,8 +210,4 @@ values  : value
           {
-            $$ = gl_list_create_empty (&gl_linked_list_implementation,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       true);
-            gl_list_add_last ($$, $1);
+            $$ = grecs_list_create ();
+            grecs_list_append ($$, $1);
           }
@@ -218,3 +215,3 @@ values  : value
           {
-            gl_list_add_last ($1, $3);
+            grecs_list_append ($1, $3);
             $$ = $1;
@@ -231,3 +228,3 @@ yyerror (char *s)
 {
-  meta1_parse_error ("%s", s);
+  grecs_error (&yylloc, 0, "%s", s);
   return 0;