Merge branch 'collectd-4.8' into collectd-4.9

[collectd.git] / src / liboconfig / parser.y

diff --git a/src/liboconfig/parser.y b/src/liboconfig/parser.y
index d237273..5b7aa94 100644 (file)
--- a/src/liboconfig/parser.y
+++ b/src/liboconfig/parser.y
@@ -1,6 +1,6 @@
 /**
  * oconfig - src/parser.y
- * Copyright (C) 2007  Florian octo Forster <octo at verplant.org>
+ * Copyright (C) 2007,2008  Florian octo Forster <octo at verplant.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -46,7 +46,7 @@ extern char           *c_file;
 }
 
 %token <number> NUMBER
-%token <boolean> TRUE FALSE
+%token <boolean> BTRUE BFALSE
 %token <string> QUOTED_STRING UNQUOTED_STRING
 %token SLASH OPENBRAC CLOSEBRAC EOL
 
@@ -76,8 +76,8 @@ string:
 
 argument:
        NUMBER                  {$$.value.number = $1; $$.type = OCONFIG_TYPE_NUMBER;}
-       | TRUE                  {$$.value.boolean = 1; $$.type = OCONFIG_TYPE_BOOLEAN;}
-       | FALSE                 {$$.value.boolean = 0; $$.type = OCONFIG_TYPE_BOOLEAN;}
+       | BTRUE                 {$$.value.boolean = 1; $$.type = OCONFIG_TYPE_BOOLEAN;}
+       | BFALSE                {$$.value.boolean = 0; $$.type = OCONFIG_TYPE_BOOLEAN;}
        | string                {$$.value.string = $1; $$.type = OCONFIG_TYPE_STRING;}
        ;
 
@@ -112,6 +112,12 @@ option:
        ;
 
 block_begin:
+       OPENBRAC identifier CLOSEBRAC EOL
+       {
+        memset (&$$, '\0', sizeof ($$));
+        $$.key = $2;
+       }
+       |
        OPENBRAC identifier argument_list CLOSEBRAC EOL
        {
         memset (&$$, '\0', sizeof ($$));
@@ -154,7 +160,7 @@ statement_list:
        statement_list statement
        {
         $$ = $1;
-        if ($2.values_num > 0)
+        if (($2.values_num > 0) || ($2.children_num > 0))
         {
                 $$.statement_num++;
                 $$.statement = realloc ($$.statement, $$.statement_num * sizeof (oconfig_item_t));
@@ -163,7 +169,7 @@ statement_list:
        }
        | statement
        {
-        if ($1.values_num > 0)
+        if (($1.values_num > 0) || ($1.children_num > 0))
         {
                 $$.statement = malloc (sizeof (oconfig_item_t));
                 $$.statement[0] = $1;
@@ -216,8 +222,8 @@ static char *unquote (const char *orig)
        if ((len < 2) || (ret[0] != '"') || (ret[len - 1] != '"'))
                return (ret);
 
-       ret++;
        len -= 2;
+       memmove (ret, ret + 1, len);
        ret[len] = '\0';
 
        for (i = 0; i < len; i++)