diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 21:21:16 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 21:52:18 +0200 |
| commit | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (patch) | |
| tree | d1880c1810fe147de6ff7f8ff317b4ec300a518f /Zend/zend_language_parser.y | |
| parent | 7813d85d3d5901b24f77b63538eb6754e161f471 (diff) | |
| parent | 455741fce3c4f4392deb97775cba7a39f6490271 (diff) | |
| download | php-git-6db293d5e043d35c281a6b11cb68460f5d7188a9.tar.gz | |
Merge remote-tracking branch 'php-src/master' into ast
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_globals.h
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_types.h
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 340371aba6..8622fbb441 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -864,13 +864,13 @@ expr_without_variable: { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.num, $1.num, $7.str, - STR_INIT("{closure}", sizeof("{closure}") - 1, 0), + zend_string_init("{closure}", sizeof("{closure}") - 1, 0), $4.ast, $6.ast, $9.ast); } | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $3.num | ZEND_ACC_STATIC, $2.num, - $8.str, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), + $8.str, zend_string_init("{closure}", sizeof("{closure}") - 1, 0), $5.ast, $7.ast, $10.ast); } ; |