- documenting the script syntax of the variable declaration

- printing an error message if the variable cannot be declared

diff --git a/cfg.y b/cfg.y
index b423f1d..c7746d2 100644 (file)
--- a/cfg.y
+++ b/cfg.y
@@ -1110,16 +1110,24 @@ assign_stm:
        ;
 cfg_var:
        ID DOT ID EQUAL NUMBER {
-               cfg_declare_int($1, $3, $5, NULL);
+               if (cfg_declare_int($1, $3, $5, NULL)) {
+                       yyerror("variable cannot be declared");
+               }
        }
        | ID DOT ID EQUAL STRING {
-               cfg_declare_str($1, $3, $5, NULL);
+               if (cfg_declare_str($1, $3, $5, NULL)) {
+                       yyerror("variable cannot be declared");
+               }
        }
        | ID DOT ID EQUAL NUMBER CFG_DESCRIPTION STRING {
-               cfg_declare_int($1, $3, $5, $7);
+               if (cfg_declare_int($1, $3, $5, $7)) {
+                       yyerror("variable cannot be declared");
+               }
        }
        | ID DOT ID EQUAL STRING CFG_DESCRIPTION STRING {
-               cfg_declare_str($1, $3, $5, $7);
+               if (cfg_declare_str($1, $3, $5, $7)) {
+                       yyerror("variable cannot be declared");
+               }
        }
        | ID DOT ID EQUAL error { yyerror("number or string expected"); }
        ;

diff --git a/doc/cfg.txt b/doc/cfg.txt
index 31189db..de41661 100644 (file)
--- a/doc/cfg.txt
+++ b/doc/cfg.txt
@@ -338,9 +338,13 @@ declare any config variable, because other modules and the core may need the
 up-to-date config.
 
 
-6. Accessing the configuration values in the script
+6. Configuration values in the script
 ===============================================================================
 
+New configuration values can be declared in the script, the syntax is:
+
+<group_name>.<var_name> = <value> [descr <description>]
+
 The values can be accessed via select calls:
 
 @cfg_get.<group_name>.<var_name>