diff options
| author | Nikita Popov <nikic@php.net> | 2014-06-28 18:22:51 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-06-28 18:24:59 +0200 |
| commit | e198132542de0be17ba25f10f0b880e721c3f67c (patch) | |
| tree | e6f54a5e8a25bc4a5aed74ee53201242edcb05a6 /Zend/zend_language_parser.y | |
| parent | 111ad71d38a62f937cfbf6a49f37b1be43860c81 (diff) | |
| download | php-git-e198132542de0be17ba25f10f0b880e721c3f67c.tar.gz | |
Drop addition of weird \ prefix for FQ consts
Also fixes a resolution bug
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 4fed735826..eeffcf610e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -995,10 +995,7 @@ scalar: zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$1)); } | 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); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } ; |