diff options
| author | Zeev Suraski <zeev@php.net> | 1999-06-12 07:43:36 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-06-12 07:43:36 +0000 |
| commit | c50cd2df991645401afc165313b8da38eb6dfc15 (patch) | |
| tree | 15f168ccb526adcda7b29a8052a061da3d536bad /Zend/zend-parser.y | |
| parent | 4bf413e358995fb660014499f62f27d40736aaec (diff) | |
| download | php-git-c50cd2df991645401afc165313b8da38eb6dfc15.tar.gz | |
We can't quite go with expr there (shift/reduce conflict), go with scalar.
Diffstat (limited to 'Zend/zend-parser.y')
| -rw-r--r-- | Zend/zend-parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y index b7ffddca47..f7e16c2e39 100644 --- a/Zend/zend-parser.y +++ b/Zend/zend-parser.y @@ -176,7 +176,7 @@ statement: | T_ECHO echo_expr_list ';' | T_INLINE_HTML { do_echo(&$1 CLS_CC); } | expr ';' { do_free(&$1 CLS_CC); } - | T_REQUIRE expr ';' { if ($2.op_type==IS_CONST && $2.u.constant.type==IS_STRING) { require_filename($2.u.constant.value.str.val CLS_CC); zval_dtor(&$2.u.constant); } else { do_include_or_eval(ZEND_INCLUDE, &$$, &$2 CLS_CC); } } + | T_REQUIRE scalar ';' { if ($2.op_type==IS_CONST && $2.u.constant.type==IS_STRING) { require_filename($2.u.constant.value.str.val CLS_CC); zval_dtor(&$2.u.constant); } else { do_include_or_eval(ZEND_INCLUDE, &$$, &$2 CLS_CC); } } | T_REQUIRE '(' expr ')' ';' { if ($3.op_type==IS_CONST && $3.u.constant.type==IS_STRING) { require_filename($3.u.constant.value.str.val CLS_CC); zval_dtor(&$3.u.constant); } else { do_include_or_eval(ZEND_INCLUDE, &$$, &$3 CLS_CC); } } | T_UNSET '(' r_cvar ')' ';' { do_unset(&$3 CLS_CC); } | T_FOREACH '(' expr T_AS { do_foreach_begin(&$1, &$3, &$2, &$4 CLS_CC); } w_cvar foreach_optional_arg ')' { do_foreach_cont(&$6, &$7, &$4 CLS_CC); } foreach_statement { do_foreach_end(&$1, &$2 CLS_CC); } |