/**
* 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
}
%token <number> NUMBER
-%token <boolean> TRUE FALSE
+%token <boolean> BTRUE BFALSE
%token <string> QUOTED_STRING UNQUOTED_STRING
%token SLASH OPENBRAC CLOSEBRAC EOL
%type <sl> statement_list
%type <ci> entire_file
+/* pass an verbose, specific error message to yyerror() */
+%error-verbose
+
%%
string:
QUOTED_STRING {$$ = unquote ($1);}
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;}
;
;
block_begin:
+ OPENBRAC identifier CLOSEBRAC EOL
+ {
+ memset (&$$, '\0', sizeof ($$));
+ $$.key = $2;
+ }
+ |
OPENBRAC identifier argument_list CLOSEBRAC EOL
{
memset (&$$, '\0', sizeof ($$));
$$.children = $2.statement;
$$.children_num = $2.statement_num;
}
+ | block_begin block_end
+ {
+ if (strcmp ($1.key, $2) != 0)
+ {
+ printf ("block_begin = %s; block_end = %s;\n", $1.key, $2);
+ yyerror ("Block not closed..\n");
+ exit (1);
+ }
+ free ($2); $2 = NULL;
+ $$ = $1;
+ $$.children = NULL;
+ $$.children_num = 0;
+ }
;
statement:
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
{
- if ($1.values_num > 0)
+ if (($1.values_num > 0) || ($1.children_num > 0))
{
$$.statement = malloc (sizeof (oconfig_item_t));
$$.statement[0] = $1;
ci_root->children = $1.statement;
ci_root->children_num = $1.statement_num;
}
+ | /* epsilon */
+ {
+ ci_root = malloc (sizeof (oconfig_item_t));
+ memset (ci_root, '\0', sizeof (oconfig_item_t));
+ ci_root->children = NULL;
+ ci_root->children_num = 0;
+ }
;
%%
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++)