com php-src: Fix s&r mistake: Zend/zend_compile.c

From: Date: Fri, 15 Aug 2014 15:27:57 +0000
Subject: com php-src: Fix s&r mistake: Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80873@lists.php.net to get a copy of this message
Commit: 471f13b75ecdb4353d0f0698a2b1013e9973b64e Author: Nikita Popov <nikic@php.net> Fri, 15 Aug 2014 17:27:57 +0200 Parents: c4460dd162852a795026ba01aa39bb0278663d99 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=471f13b75ecdb4353d0f0698a2b1013e9973b64e Log: Fix s&r mistake Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 22d5066..948fc55 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3389,7 +3389,7 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } -static inline zend_op *zend_zend_emit_op_data(znode *value TSRMLS_DC) { +static inline zend_op *zend_emit_op_data(znode *value TSRMLS_DC) { return zend_emit_op(NULL, ZEND_OP_DATA, value, NULL TSRMLS_CC); } @@ -3873,7 +3873,7 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = ZEND_ASSIGN_DIM; - opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; return; @@ -3885,7 +3885,7 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = ZEND_ASSIGN_OBJ; - zend_zend_emit_op_data(&expr_node TSRMLS_CC); + zend_emit_op_data(&expr_node TSRMLS_CC); return; case ZEND_AST_LIST: zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); @@ -3963,7 +3963,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_DIM; - opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; return; @@ -3976,7 +3976,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_OBJ; - zend_zend_emit_op_data(&expr_node TSRMLS_CC); + zend_emit_op_data(&expr_node TSRMLS_CC); return; EMPTY_SWITCH_DEFAULT_CASE() }

« previous php.cvs (#80873) next »