com php-src: Fix previous commit: Zend/zend_language_parser .y
| From: | Nikita Popov | Date: | Sat, 31 May 2014 15:02:48 +0000 |
| Subject: | com php-src: Fix previous commit: Zend/zend_language_parser .y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81076@lists.php.net to get a copy of this message | ||
Commit: fd85f77857b38ba0ec2c27a1c27a3e0ebae36410
Author: Nikita Popov <nikic@php.net> Sat, 31 May 2014 17:02:48 +0200
Parents: 64f80b3835aba0d3ad2c17a78e2d6dcf1c0bfc5e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd85f77857b38ba0ec2c27a1c27a3e0ebae36410
Log:
Fix previous commit
Changed paths:
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 014915f..4473e37 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -946,17 +946,21 @@ static_scalar: /* compile-time evaluated scalars */
static_scalar_value { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); }
;
+static_scalar_base:
+ common_scalar { $$ = $1; }
+ | T_CONSTANT_ENCAPSED_STRING { $$ = $1; }
+ | T_CLASS_C { $$ = $1; }
+ | static_class_name_scalar { $$ = $1; }
+ | static_class_constant { $$ = $1; }
+ | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); }
+ | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST;
ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3
TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); }
+ | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp,
STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) +
1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0)
{efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$,
NULL, &$2, ZEND_CT, 0 TSRMLS_CC); }
+;
+
static_scalar_value:
- common_scalar { $$.u.ast = zend_ast_create_constant(&$1.u.constant); }
- | static_class_name_scalar { $$.u.ast = zend_ast_create_constant(&$1.u.constant); }
- | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC);
$$.u.ast = zend_ast_create_constant(&$$.u.constant); }
- | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST;
ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3
TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); $$.u.ast
= zend_ast_create_constant(&$$.u.constant); }
- | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp,
STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) +
1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0)
{efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$,
NULL, &$2, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = zend_ast_create_constant(&$$.u.constant); }
+ static_scalar_base { $$.u.ast = zend_ast_create_constant(&$1.u.constant); }
| T_ARRAY '(' static_array_pair_list ')' { $$ = $3; }
| '[' static_array_pair_list ']' { $$ = $2; }
- | T_CONSTANT_ENCAPSED_STRING { $$ = $1; }
- | static_class_constant { $$.u.ast = zend_ast_create_constant(&$1.u.constant); }
- | T_CLASS_C { $$.u.ast = zend_ast_create_constant(&$1.u.constant); }
| static_operation { $$ = $1; }
;