com php-src: Port for: Zend/zend_compile.c Zend/zend_la nguage_parser.y
| From: | Nikita Popov | Date: | Thu, 10 Jul 2014 13:51:47 +0000 |
| Subject: | com php-src: Port for: Zend/zend_compile.c Zend/zend_la nguage_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81022@lists.php.net to get a copy of this message | ||
Commit: 3be63fca48b331766224da07ddeb3f0b78ba9704
Author: Nikita Popov <nikic@php.net> Thu, 10 Jul 2014 15:51:47 +0200
Parents: 80c44ad510513fb15d6d118d17e3ab8c577658a3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3be63fca48b331766224da07ddeb3f0b78ba9704
Log:
Port for
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 b08d1a9..964b048c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7116,6 +7116,54 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) {
do_end_loop(opnum_cond, 0 TSRMLS_CC);
}
+void zend_compile_expr_list(znode *result, zend_ast *ast TSRMLS_DC) {
+ zend_uint i;
+
+ result->op_type = IS_UNUSED;
+ for (i = 0; i < ast->children; ++i) {
+ zend_ast *expr_ast = ast->child[i];
+
+ zend_do_free(result TSRMLS_CC);
+ zend_compile_expr(result, expr_ast TSRMLS_CC);
+ }
+}
+
+void zend_compile_for(zend_ast *ast TSRMLS_DC) {
+ zend_ast *init_ast = ast->child[0];
+ zend_ast *cond_ast = ast->child[1];
+ zend_ast *loop_ast = ast->child[2];
+ zend_ast *stmt_ast = ast->child[3];
+
+ znode result;
+ zend_uint opnum_cond, opnum_jmpz, opnum_loop;
+ zend_op *opline;
+
+ zend_compile_expr_list(&result, init_ast TSRMLS_CC);
+ zend_do_free(&result TSRMLS_CC);
+
+ opnum_cond = get_next_op_number(CG(active_op_array));
+ zend_compile_expr_list(&result, cond_ast TSRMLS_CC);
+ zend_do_extended_info(TSRMLS_C);
+
+ opnum_jmpz = get_next_op_number(CG(active_op_array));
+ emit_op(NULL, ZEND_JMPZ, &result, NULL TSRMLS_CC);
+ do_begin_loop(TSRMLS_C);
+
+ zend_compile_stmt(stmt_ast TSRMLS_CC);
+
+ opnum_loop = get_next_op_number(CG(active_op_array));
+ zend_compile_expr_list(&result, loop_ast TSRMLS_CC);
+ zend_do_free(&result TSRMLS_CC);
+
+ opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC);
+ opline->op1.opline_num = opnum_cond;
+
+ opline = &CG(active_op_array)->opcodes[opnum_jmpz];
+ opline->op2.opline_num = get_next_op_number(CG(active_op_array));
+
+ do_end_loop(opnum_loop, 0 TSRMLS_CC);
+}
+
void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) {
zend_uint i;
for (i = 0; i < ast->children; ++i) {
@@ -7907,6 +7955,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) {
case ZEND_AST_DO_WHILE:
zend_compile_do_while(ast TSRMLS_CC);
break;
+ case ZEND_AST_FOR:
+ zend_compile_for(ast TSRMLS_CC);
+ break;
default:
{
znode result;
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 6879993..a3bae7f 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -330,7 +330,7 @@ unticked_statement:
| T_DO statement T_WHILE parenthesis_expr ';'
{ $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); }
| T_FOR '(' for_expr ';' for_expr ';' for_expr ')'
for_statement
- { $$.u.ast = NULL; }
+ { $$.u.ast = zend_ast_create(4, ZEND_AST_FOR, $3.u.ast, $5.u.ast, $7.u.ast, $9.u.ast); }
/*| T_FOR
'('
for_expr