com php-src: Formatting: Zend/zend_compile.c

From: Date: Tue, 29 Jul 2014 19:00:19 +0000
Subject: com php-src: Formatting: Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80885@lists.php.net to get a copy of this message
Commit: 763eb13d6e8979c6c3f5416fbeb0f7031e94a61b Author: Nikita Popov <nikic@php.net> Tue, 29 Jul 2014 21:00:19 +0200 Parents: 438b1e3d42a5605bfa12a9282590894205c9b057 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=763eb13d6e8979c6c3f5416fbeb0f7031e94a61b Log: Formatting Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a144c6d..7cdc8ef 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6422,19 +6422,16 @@ void zend_compile_short_circuiting(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; - - znode var_node; - zend_op *opline; - ZEND_ASSERT(ast->kind == ZEND_AST_POST_INC || ast->kind == ZEND_AST_POST_DEC); if (var_ast->kind == ZEND_AST_PROP) { - opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); + zend_op *opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ; opline->result_type = IS_TMP_VAR; opline->result.var = get_temporary_variable(CG(active_op_array)); GET_NODE(result, opline->result); } else { + znode var_node; zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); zend_emit_op_tmp(result, ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC : ZEND_POST_DEC, &var_node, NULL TSRMLS_CC); @@ -6443,16 +6440,13 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_pre_incdec(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; - - znode var_node; - zend_op *opline; - ZEND_ASSERT(ast->kind == ZEND_AST_PRE_INC || ast->kind == ZEND_AST_PRE_DEC); if (var_ast->kind == ZEND_AST_PROP) { - opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + zend_op *opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ; } else { + znode var_node; zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); zend_emit_op(result, ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC : ZEND_PRE_DEC, &var_node, NULL TSRMLS_CC);

« previous php.cvs (#80885) next »