More work on that autoconf/automake stuff..

[liboconfig.git] / src / parser.y

diff --git a/src/parser.y b/src/parser.y
index 911363c..9932469 100644 (file)
--- a/src/parser.y
+++ b/src/parser.y
@@ -3,15 +3,6 @@
 #include <string.h>
 #include "oconfig.h"
 
-static oconfig_item_t *ci_root;
-static oconfig_item_t *ci_current;
-
-static oconfig_item_t  *statement_list;
-static int              statement_list_num;
-
-static oconfig_value_t *argument_list;
-static int              argument_list_num;
-
 struct statement_list_s
 {
        oconfig_item_t *statement;
@@ -26,6 +17,7 @@ struct argument_list_s
 };
 typedef struct argument_list_s argument_list_t;
 
+static char *unquote (const char *orig);
 static void dump_ci (oconfig_item_t *ci, int shift);
 %}
 
@@ -36,7 +28,6 @@ static void dump_ci (oconfig_item_t *ci, int shift);
        int     boolean;
        char   *string;
        oconfig_value_t  cv;
-       oconfig_value_t *cvp;
        oconfig_item_t   ci;
        argument_list_t  al;
        statement_list_t sl;
@@ -49,19 +40,23 @@ static void dump_ci (oconfig_item_t *ci, int shift);
 
 %type <string> string
 %type <string> identifier
-%type <string> block_end
+/* arguments */
 %type <cv> argument
 %type <al> argument_list
+/* blocks */
 %type <ci> block_begin
 %type <ci> block
+%type <string> block_end
+/* statements */
 %type <ci> option
 %type <ci> statement
 %type <sl> statement_list
+%type <ci> entire_file
 
 %%
 string:
-       QUOTED_STRING           {$$ = $1;}
-       | UNQUOTED_STRING       {$$ = $1;}
+       QUOTED_STRING           {$$ = unquote ($1);}
+       | UNQUOTED_STRING       {$$ = strdup ($1);}
        ;
 
 argument:
@@ -76,19 +71,19 @@ argument_list:
        {
         $$ = $1;
         $$.argument_num++;
-        $$.argument = realloc ($$.argument, $$.argument_num * sizeof (argument_list_t));
+        $$.argument = realloc ($$.argument, $$.argument_num * sizeof (oconfig_value_t));
         $$.argument[$$.argument_num-1] = $2;
        }
        | argument
        {
-        $$.argument = malloc (sizeof (argument_list_t));
+        $$.argument = malloc (sizeof (oconfig_value_t));
         $$.argument[0] = $1;
         $$.argument_num = 1;
        }
        ;
 
 identifier:
-       UNQUOTED_STRING                 {$$ = $1;}
+       UNQUOTED_STRING                 {$$ = strdup ($1);}
        ;
 
 option:
@@ -98,7 +93,6 @@ option:
         $$.key = $1;
         $$.values = $2.argument;
         $$.values_num = $2.argument_num;
-        printf ("Option `%s' has %i arguments\n", $$.key, $$.values_num);
        }
        ;
 
@@ -109,83 +103,111 @@ block_begin:
         $$.key = $2;
         $$.values = $3.argument;
         $$.values_num = $3.argument_num;
-        printf ("Begin block `%s'\n", $2);
        }
        ;
 
 block_end:
-       OPENBRAC SLASH identifier CLOSEBRAC EOL {$$ = $3; printf ("End block `%s'\n", $3);}
+       OPENBRAC SLASH identifier CLOSEBRAC EOL
+       {
+        $$ = $3;
+       }
        ;
 
 block:
        block_begin statement_list block_end
        {
         if (strcmp ($1.key, $3) != 0)
-               yyerror ("Block %s not closed..\n", $1);
+        {
+               printf ("block_begin = %s; block_end = %s;\n", $1.key, $3);
+               yyerror ("Block not closed..\n");
+               exit (1);
+        }
         $$ = $1;
         $$.children = $2.statement;
+        $$.children_num = $2.statement_num;
        }
        ;
 
 statement:
        option          {$$ = $1;}
        | block         {$$ = $1;}
-       | EOL           {/* ignore */}
+       | EOL           {$$.values_num = 0;}
        ;
 
 statement_list:
        statement_list statement
        {
         $$ = $1;
-        $$.statement_num++;
-        $$.statement = realloc ($$.statement, $$.statement_num * sizeof (statement_list_t));
-        $$.statement[$$.statement_num-1] = $2;
-        printf ("statement_list: length = %i\n", $$.statement_num);
+        if ($2.values_num > 0)
+        {
+                $$.statement_num++;
+                $$.statement = realloc ($$.statement, $$.statement_num * sizeof (oconfig_item_t));
+                $$.statement[$$.statement_num-1] = $2;
+        }
        }
        | statement
        {
-        $$.statement = malloc (sizeof (statement_list_t));
-        $$.statement[0] = $1;
-        $$.statement_num = 1;
+        if ($1.values_num > 0)
+        {
+                $$.statement = malloc (sizeof (oconfig_item_t));
+                $$.statement[0] = $1;
+                $$.statement_num = 1;
+        }
+        else
+        {
+               $$.statement = NULL;
+               $$.statement_num = 0;
+        }
        }
        ;
 
 entire_file:
        statement_list
        {
-        int i;
-        for (i = 0; i < $1.statement_num; i++)
-               dump_ci ($1.statement + i, 0);
+        $$.children = $1.statement;
+        $$.children_num = $1.statement_num;
        }
        ;
 
 %%
-#include "lex.yy.c"
+#include "scanner.c"
 
-/*
-void yyerror (char *s)
+static char *unquote (const char *orig)
 {
-       fprintf (stderr, "%s\n", s);
-}
+       char *ret = strdup (orig);
+       int len;
+       int i;
 
-int yylex (void)
-{
-       return (getc (stdin));
-}
-*/
+       if (ret == NULL)
+               return (NULL);
 
-int main (int argc, char **argv)
-{
-       yyparse ();
-       return (0);
-}
+       len = strlen (ret);
+
+       if ((len < 2) || (ret[0] != '"') || (ret[len - 1] != '"'))
+               return (ret);
+
+       ret++;
+       len -= 2;
+       ret[len] = '\0';
+
+       for (i = 0; i < len; i++)
+       {
+               if (ret[i] == '\\')
+               {
+                       memmove (ret + i, ret + (i + 1), len - i);
+                       len--;
+               }
+       }
+
+       return (ret);
+} /* char *unquote */
 
 static void dump_ci (oconfig_item_t *ci, int shift)
 {
        int i;
 
        if (shift > 0)
-               printf ("%*s", "", shift);
+               printf ("%*s", shift, "");
 
        printf ("%s", ci->key);
        for (i = 0; i < ci->values_num; i++)