com php-src: Expr stmts go through ast: Zend/zend_compile.c Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Wed, 09 Jul 2014 22:04:27 +0000 |
| Subject: | com php-src: Expr stmts go through ast: Zend/zend_compile.c Zend/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81020@lists.php.net to get a copy of this message | ||
Commit: 68777b72b25afd7373d4e2fe3e2980b8fb15da5d
Author: Nikita Popov <nikic@php.net> Thu, 10 Jul 2014 00:04:27 +0200
Parents: 1de1bc96a5b281e9ba764b99bb2a487975806cbc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=68777b72b25afd7373d4e2fe3e2980b8fb15da5d
Log:
Expr stmts go through ast
Changed paths:
M Zend/zend_compile.c
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 294ce9b..f4ac95e 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7853,7 +7853,12 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) {
case ZEND_AST_LABEL:
zend_compile_label(ast TSRMLS_CC);
break;
- EMPTY_SWITCH_DEFAULT_CASE()
+ default:
+ {
+ znode result;
+ zend_compile_expr(&result, ast TSRMLS_CC);
+ zend_do_free(&result TSRMLS_CC);
+ }
}
if (Z_LVAL(CG(declarables).ticks) && !zend_is_unticked_stmt(ast)) {
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index f5ea217..07039d2 100644
--- a/Zend/zend_language_parser..y
+++ b/Zend/zend_language_parser.y
@@ -349,7 +349,7 @@ unticked_statement:
| T_STATIC static_var_list ';' { AN($$); }
| T_ECHO echo_expr_list ';' { $$.u.ast = $2.u.ast; }
| T_INLINE_HTML { $$.u..ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); }
- | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); AN($$); }
+ | expr ';' { $$.u.ast = $1.u.ast; }
| T_UNSET '(' unset_variables ')' ';' { $$.u.ast = $3.u.ast; }
| T_FOREACH '(' variable T_AS
{ zend_do_foreach_begin(&$1, &$2, &$3, &$4, 1 TSRMLS_CC); }