diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-06 22:21:07 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-06 22:21:07 +0400 |
| commit | 9647c61dc101b9d460259fedb3731026f0390eeb (patch) | |
| tree | c002ea1be17965f999c1b801b48dbfd3788c962d /Zend/zend_variables.c | |
| parent | af600c240d2efe33291e8dd71ce228b9fbc849c1 (diff) | |
| download | php-git-9647c61dc101b9d460259fedb3731026f0390eeb.tar.gz | |
Constant expressions refactoring
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 095c16ca91..3fa1b063a1 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -49,7 +49,7 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC) } break; case IS_CONSTANT_AST: - ZEND_AST_DEL_REF(Z_AST_P(zvalue)); + zend_ast_destroy(Z_AST_P(zvalue)); break; case IS_OBJECT: { @@ -85,11 +85,9 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) CHECK_ZVAL_STRING_REL(zvalue); str_free(zvalue->value.str.val); break; - case IS_CONSTANT_AST: - ZEND_AST_DEL_REF(Z_AST_P(zvalue)); - break; case IS_ARRAY: case IS_CONSTANT_ARRAY: + case IS_CONSTANT_AST: case IS_OBJECT: case IS_RESOURCE: zend_error(E_CORE_ERROR, "Internal zval's can't be arrays, objects or resources"); @@ -147,7 +145,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) } break; case IS_CONSTANT_AST: - ZEND_AST_ADD_REF(Z_AST_P(zvalue)); + Z_AST_P(zvalue) = zend_ast_copy(Z_AST_P(zvalue)); break; case IS_OBJECT: { |