diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-09-29 21:49:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-09-29 21:50:15 +0800 |
| commit | df2ff75116dc96d542aa7631028b09954faa4fea (patch) | |
| tree | 56d83c28280298dbfdfa5add3d5038e131080334 /Zend | |
| parent | 27d4d32e6bd4c6ff2f65d162e9478671348764f4 (diff) | |
| download | php-git-df2ff75116dc96d542aa7631028b09954faa4fea.tar.gz | |
Make ZEND_ECHO and removed ZEND_PRINT distinguishable
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_compile.c | 8 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8e9f5414dd..4886fcc57e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3612,12 +3612,14 @@ void zend_compile_return(zend_ast *ast) /* {{{ */ void zend_compile_echo(zend_ast *ast) /* {{{ */ { + zend_op *opline; zend_ast *expr_ast = ast->child[0]; znode expr_node; zend_compile_expr(&expr_node, expr_ast); - zend_emit_op(NULL, ZEND_ECHO, &expr_node, NULL); + opline = zend_emit_op(NULL, ZEND_ECHO, &expr_node, NULL); + opline->extended_value = ZEND_ECHO; } /* }}} */ @@ -6214,12 +6216,14 @@ void zend_compile_coalesce(znode *result, zend_ast *ast) /* {{{ */ void zend_compile_print(znode *result, zend_ast *ast) /* {{{ */ { + zend_op *opline; zend_ast *expr_ast = ast->child[0]; znode expr_node; zend_compile_expr(&expr_node, expr_ast); - zend_emit_op(NULL, ZEND_ECHO, &expr_node, NULL); + opline = zend_emit_op(NULL, ZEND_ECHO, &expr_node, NULL); + opline->extended_value = ZEND_PRINT; result->op_type = IS_CONST; ZVAL_LONG(&result->u.constant, 1); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index f6283fb5c9..3a0304101a 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -954,9 +954,10 @@ static zend_always_inline int zend_check_arg_send_type(const zend_function *zf, #define ZEND_ARRAY_SIZE_SHIFT 2 /* Pseudo-opcodes that are used only temporarily during compilation */ -#define ZEND_GOTO 253 -#define ZEND_BRK 254 -#define ZEND_CONT 255 +#define ZEND_PRINT 252 +#define ZEND_GOTO 253 +#define ZEND_BRK 254 +#define ZEND_CONT 255 END_EXTERN_C() |