diff options
| author | SVN Migration <svn@php.net> | 2006-08-15 13:14:48 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2006-08-15 13:14:48 +0000 |
| commit | 1bfb88081d1fb0211feaa18b8a5b635fc03594b8 (patch) | |
| tree | 80d09fe7fec47fd936eb7abf5e9a5b729573db9a /Zend/zend_ini_parser.y | |
| parent | 407caf3a0c260e37985693201cda727a1b0dc128 (diff) | |
| download | php-git-php-5.1.5.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_1_5'.php-5.1.5
Diffstat (limited to 'Zend/zend_ini_parser.y')
| -rw-r--r-- | Zend/zend_ini_parser.y | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 244673dba6..8c1976ac88 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -249,26 +249,25 @@ string_or_value: expr { $$ = $1; } | CFG_TRUE { $$ = $1; } | CFG_FALSE { $$ = $1; } + | var_string_list { $$ = $1; } | '\n' { zend_ini_init_string(&$$); } | /* empty */ { zend_ini_init_string(&$$); } ; var_string_list: - cfg_var_ref { $$ = $1; } - | TC_ENCAPSULATED_STRING { $$ = $1; } - | constant_string { $$ = $1; } - | var_string_list cfg_var_ref { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); } + var_string_list cfg_var_ref { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); } | var_string_list TC_ENCAPSULATED_STRING { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); } - | var_string_list constant_string { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); } + | var_string_list constant_string { zend_ini_add_string(&$$, &$1, &$2); } + | /* empty */ { zend_ini_init_string(&$$); } ; cfg_var_ref: - TC_DOLLAR_CURLY TC_STRING '}' { zend_ini_get_var(&$$, &$2); free($2.value.str.val); } + TC_DOLLAR_CURLY TC_STRING '}' { zend_ini_get_var(&$$, &$2); } ; expr: - var_string_list { $$ = $1; } + constant_string { $$ = $1; } | expr '|' expr { zend_ini_do_op('|', &$$, &$1, &$3); } | expr '&' expr { zend_ini_do_op('&', &$$, &$1, &$3); } | '~' expr { zend_ini_do_op('~', &$$, &$2, NULL); } |