diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-27 15:57:13 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-27 15:57:13 -0700 |
| commit | aba30ce30676b6d73a2169b10311dfb07768630c (patch) | |
| tree | a8f56339dff39eba9a933a718362f390ef77621d /Zend/zend_language_parser.y | |
| parent | a3b0fa0d04cad5712f64e08463d0026f9890a37c (diff) | |
| parent | 56eee05f66431b153c9212452c1f4f2e8525efc4 (diff) | |
| download | php-git-aba30ce30676b6d73a2169b10311dfb07768630c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Dmitry Stogov (2) and others
# Via Christopher Jones (22) and others
* 'master' of https://git.php.net/repository/php-src:
Removed references to "Zend Support"
Added support for GNU Hurd. (Svante Signell)
- Updated to version 2013.6 (2013f)
More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 4523783dec..d46149957a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -528,14 +528,15 @@ parameter_list: non_empty_parameter_list: + parameter + | non_empty_parameter_list ',' parameter +; + +parameter: optional_class_type is_reference is_variadic T_VARIABLE - { $$.op_type = IS_UNUSED; $$.u.op.num=1; zend_do_receive_arg(ZEND_RECV, &$4, &$$, NULL, &$1, $2.op_type, $3.op_type TSRMLS_CC); } + { zend_do_receive_param(ZEND_RECV, &$4, NULL, &$1, $2.op_type, $3.op_type TSRMLS_CC); } | optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar - { $$.op_type = IS_UNUSED; $$.u.op.num=1; zend_do_receive_arg(ZEND_RECV_INIT, &$4, &$$, &$6, &$1, $2.op_type, $3.op_type TSRMLS_CC); } - | non_empty_parameter_list ',' optional_class_type is_reference is_variadic T_VARIABLE - { $$=$1; $$.u.op.num++; zend_do_receive_arg(ZEND_RECV, &$6, &$$, NULL, &$3, $4.op_type, $5.op_type TSRMLS_CC); } - | non_empty_parameter_list ',' optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar - { $$=$1; $$.u.op.num++; zend_do_receive_arg(ZEND_RECV_INIT, &$6, &$$, &$8, &$3, $4.op_type, $5.op_type TSRMLS_CC); } + { zend_do_receive_param(ZEND_RECV_INIT, &$4, &$6, &$1, $2.op_type, $3.op_type TSRMLS_CC); } ; |