projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
[collectd.git]
/
src
/
liboconfig
/
parser.y
diff --git
a/src/liboconfig/parser.y
b/src/liboconfig/parser.y
index
48b9bf3
..
49cd139
100644
(file)
--- a/
src/liboconfig/parser.y
+++ b/
src/liboconfig/parser.y
@@
-1,6
+1,6
@@
/**
* oconfig - src/parser.y
/**
* 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
*
* 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
@@
-65,6
+65,9
@@
extern char *c_file;
%type <sl> statement_list
%type <ci> entire_file
%type <sl> statement_list
%type <ci> entire_file
+/* pass an verbose, specific error message to yyerror() */
+%error-verbose
+
%%
string:
QUOTED_STRING {$$ = unquote ($1);}
%%
string:
QUOTED_STRING {$$ = unquote ($1);}
@@
-109,6
+112,12
@@
option:
;
block_begin:
;
block_begin:
+ OPENBRAC identifier CLOSEBRAC EOL
+ {
+ memset (&$$, '\0', sizeof ($$));
+ $$.key = $2;
+ }
+ |
OPENBRAC identifier argument_list CLOSEBRAC EOL
{
memset (&$$, '\0', sizeof ($$));
OPENBRAC identifier argument_list CLOSEBRAC EOL
{
memset (&$$, '\0', sizeof ($$));
@@
-151,7
+160,7
@@
statement_list:
statement_list statement
{
$$ = $1;
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));
{
$$.statement_num++;
$$.statement = realloc ($$.statement, $$.statement_num * sizeof (oconfig_item_t));
@@
-160,7
+169,7
@@
statement_list:
}
| statement
{
}
| statement
{
- if (
$1.values_num > 0
)
+ if (
($1.values_num > 0) || ($1.children_num > 0)
)
{
$$.statement = malloc (sizeof (oconfig_item_t));
$$.statement[0] = $1;
{
$$.statement = malloc (sizeof (oconfig_item_t));
$$.statement[0] = $1;
@@
-213,8
+222,8
@@
static char *unquote (const char *orig)
if ((len < 2) || (ret[0] != '"') || (ret[len - 1] != '"'))
return (ret);
if ((len < 2) || (ret[0] != '"') || (ret[len - 1] != '"'))
return (ret);
- ret++;
len -= 2;
len -= 2;
+ memmove (ret, ret + 1, len);
ret[len] = '\0';
for (i = 0; i < len; i++)
ret[len] = '\0';
for (i = 0; i < len; i++)