mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Port while

Browse Source 
Note: From here on everything is broken
This commit is contained in:
Nikita Popov 2014-07-10 14:35:59 +02:00
parent 68777b72b2
commit c7656c06cc
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_ast.h
View File

@ -75,6 +75,8 @@ enum _zend_ast_kind {
ZEND_AST_UNSET,
ZEND_AST_RETURN,
ZEND_AST_LABEL,
ZEND_AST_WHILE,
};
typedef unsigned short zend_ast_kind;

29
Zend/zend_compile.c
View File

@ -7068,6 +7068,32 @@ void zend_compile_label(zend_ast *ast TSRMLS_DC) {
}
}
void zend_compile_while(zend_ast *ast TSRMLS_DC) {
zend_ast *cond_ast = ast->child[0];
zend_ast *stmt_ast = ast->child[1];
znode cond_node;
zend_uint opnum_start, opnum_jmpz;
zend_op *opline;
opnum_start = get_next_op_number(CG(active_op_array));
zend_compile_expr(&cond_node, cond_ast TSRMLS_CC);
opnum_jmpz = get_next_op_number(CG(active_op_array));
emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC);
do_begin_loop(TSRMLS_C);
zend_compile_stmt(stmt_ast TSRMLS_CC);
opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC);
opline->op1.opline_num = opnum_start;
opline = &CG(active_op_array)->opcodes[opnum_jmpz];
opline->op2.opline_num = get_next_op_number(CG(active_op_array));
do_end_loop(opnum_start, 0 TSRMLS_CC);
}
void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) {
zend_uint i;
for (i = 0; i < ast->children; ++i) {
@ -7853,6 +7879,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) {
case ZEND_AST_LABEL:
zend_compile_label(ast TSRMLS_CC);
break;
case ZEND_AST_WHILE:
zend_compile_while(ast TSRMLS_CC);
break;
default:
{
znode result;

8
Zend/zend_language_parser.y
View File

@ -325,7 +325,9 @@ unticked_statement:
'{' inner_statement_list '}' { AN($$); }
| T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { AS($4); zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); }
| T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); }
| T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); }
| T_WHILE parenthesis_expr while_statement
{ $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); }
/*| T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); }*/
| T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { AS($3); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); AN($$); }
| T_FOR
'('
@ -532,8 +534,8 @@ case_separator:
while_statement:
statement { AS($1); }
| ':' inner_statement_list T_ENDWHILE ';'
statement { $$.u.ast = $1.u.ast; }
| ':' inner_statement_list T_ENDWHILE ';' { AN($$); }
;