Merge branch 'master' of ssh://git.php.net/php-src

This commit is contained in:
Andrey Hristov 2012-12-19 16:20:31 +01:00
commit 87f80928ba

View File

@ -300,7 +300,7 @@ unticked_statement:
| T_RETURN ';' { zend_do_return(NULL, 0 TSRMLS_CC); }
| T_RETURN expr_without_variable ';' { zend_do_return(&$2, 0 TSRMLS_CC); }
| T_RETURN variable ';' { zend_do_return(&$2, 1 TSRMLS_CC); }
| yield_expr ';' { $$ = $1; }
| yield_expr ';' { zend_do_free(&$1 TSRMLS_CC); }
| T_GLOBAL global_var_list ';'
| T_STATIC static_var_list ';'
| T_ECHO echo_expr_list ';'