diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
| commit | 71675a4bf830d7b9400663275fe48275480d34f4 (patch) | |
| tree | 8ce9b1fdda30d26121334fb5c228df7884f6f7c2 /Zend/zend_ast.c | |
| parent | f72d6f97ecf976f00abc0dc21b5d1ef4838de60a (diff) | |
| parent | 8b66d64b2343bc4fd8aeabb690024edb850a0155 (diff) | |
| download | php-git-71675a4bf830d7b9400663275fe48275480d34f4.tar.gz | |
Merge remote-tracking branch 'php-src/phpng' into ast
Conflicts:
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_language_parser.y
Incomplete merge!
Diffstat (limited to 'Zend/zend_ast.c')
| -rw-r--r-- | Zend/zend_ast.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 2dd5b16f44..8e1d970c41 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -173,7 +173,6 @@ static void zend_ast_add_array_element(zval *result, zval *offset, zval *expr TS break; case IS_STRING: zend_symtable_update(Z_ARRVAL_P(result), Z_STR_P(offset), expr); -//??? zval_dtor(offset); break; case IS_NULL: @@ -234,11 +233,22 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s break; } case ZEND_AST_ZVAL: - ZVAL_DUP(result, zend_ast_get_zval(ast)); - if (Z_OPT_CONSTANT_P(result)) { - zval_update_constant_ex(result, 1, scope TSRMLS_CC); + { + zval *zv = zend_ast_get_zval(ast); + if (scope) { + /* class constants may be updated in-place */ + if (Z_OPT_CONSTANT_P(zv)) { + zval_update_constant_ex(zv, 1, scope TSRMLS_CC); + } + ZVAL_DUP(result, zv); + } else { + ZVAL_DUP(result, zv); + if (Z_OPT_CONSTANT_P(result)) { + zval_update_constant_ex(result, 1, scope TSRMLS_CC); + } } break; + } case ZEND_AST_AND: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { @@ -304,20 +314,17 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s } } break; -//??? -#if 0 case ZEND_FETCH_DIM_R: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); { - zval *tmp; + zval tmp; zend_fetch_dimension_by_zval(&tmp, &op1, &op2 TSRMLS_CC); - ZVAL_ZVAL(result, tmp, 1, 1); + ZVAL_ZVAL(result, &tmp, 1, 1); } zval_dtor(&op1); zval_dtor(&op2); break; -#endif default: zend_error(E_ERROR, "Unsupported constant expression"); } |