diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-25 20:07:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-26 13:03:55 +0200 |
| commit | d60e3c6ef53986e82178bb657ad907edc16d2c34 (patch) | |
| tree | 473211d0b04ac4eec07e2730277d31501b432a6d /Zend/zend_language_parser.y | |
| parent | bd70d155885fdc087afba912c1b290615b864e2f (diff) | |
| parent | 35951d4be0bd27c85519995a95429bd0d0a76a00 (diff) | |
| download | php-git-d60e3c6ef53986e82178bb657ad907edc16d2c34.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Conflicts:
Zend/zend_language_parser.y
Zend/zend_vm_execute.skl
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 8b0f500895..c1514c5d78 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -432,10 +432,10 @@ foreach_optional_arg: | T_DOUBLE_ARROW foreach_variable { $$ = $2; } ; - foreach_variable: variable { zend_check_writable_variable(&$1); $$ = $1; } | '&' variable { zend_check_writable_variable(&$2); $$ = $2; $$.EA |= ZEND_PARSED_REFERENCE_VARIABLE; } + | T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' { $$ = $1; $$.EA = ZEND_PARSED_LIST_EXPR; } ; for_statement: |