X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboconfig%2Fparser.y;h=19f58b2b75c4f19b9b196f5d15b85f8f78dd21ac;hb=3faf514fd9b869cadda0f895e14e5036313c7781;hp=ea6ed0a099a2a822bd119dc6c16ebadcad594c25;hpb=d561a8387f633491bdcd7fe6964f0b63ae694af5;p=collectd.git

diff --git a/src/liboconfig/parser.y b/src/liboconfig/parser.y
index ea6ed0a0..19f58b2b 100644
--- 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
@@ -30,6 +30,7 @@ extern int yylineno;
 extern char *yytext;
 
 extern oconfig_item_t *ci_root;
+extern char           *c_file;
 %}
 
 %start entire_file
@@ -45,7 +46,7 @@ extern oconfig_item_t *ci_root;
 }
 
 %token <number> NUMBER
-%token <boolean> TRUE FALSE
+%token <boolean> BTRUE BFALSE
 %token <string> QUOTED_STRING UNQUOTED_STRING
 %token SLASH OPENBRAC CLOSEBRAC EOL
 
@@ -64,6 +65,9 @@ extern oconfig_item_t *ci_root;
 %type <sl> statement_list
 %type <ci> entire_file
 
+/* pass an verbose, specific error message to yyerror() */
+%error-verbose
+
 %%
 string:
 	QUOTED_STRING		{$$ = unquote ($1);}
@@ -72,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;}
 	;
 
@@ -108,6 +112,12 @@ option:
 	;
 
 block_begin:
+	OPENBRAC identifier CLOSEBRAC EOL
+	{
+	 memset (&$$, '\0', sizeof ($$));
+	 $$.key = $2;
+	}
+	|
 	OPENBRAC identifier argument_list CLOSEBRAC EOL
 	{
 	 memset (&$$, '\0', sizeof ($$));
@@ -138,6 +148,19 @@ block:
 	 $$.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:
@@ -150,7 +173,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));
@@ -159,7 +182,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;
@@ -181,12 +204,27 @@ entire_file:
 	 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;
+	}
 	;
 
 %%
 static int yyerror (const char *s)
 {
-	fprintf (stderr, "Error in line %i near `%s': %s\n", yylineno, yytext, s);
+	char *text;
+
+	if (*yytext == '\n')
+		text = "<newline>";
+	else
+		text = yytext;
+
+	fprintf (stderr, "Parse error in file `%s', line %i near `%s': %s\n",
+		c_file, yylineno, text, s);
 	return (-1);
 } /* int yyerror */
 
@@ -204,8 +242,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++)