break/continue

Author: arnaud-lb

Zend/zend_compile.c

@@ -712,7 +712,7 @@ void zend_stop_lexing(void)
 }
 
 static inline void zend_begin_loop(
-		uint8_t free_opcode, const znode *loop_var, bool is_switch) /* {{{ */
+		uint8_t free_opcode, const znode *loop_var, zend_brk_cont_kind kind) /* {{{ */
 {
 	zend_brk_cont_element *brk_cont_element;
 	int parent = CG(context).current_brk_cont;
@@ -721,7 +721,7 @@ static inline void zend_begin_loop(
 	CG(context).current_brk_cont = CG(context).last_brk_cont;
 	brk_cont_element = get_next_brk_cont_element();
 	brk_cont_element->parent = parent;
-	brk_cont_element->is_switch = is_switch;
+	brk_cont_element->kind = kind;
 
 	if (loop_var && (loop_var->op_type & (IS_VAR|IS_TMP_VAR))) {
 		uint32_t start = get_next_op_number();
@@ -5828,13 +5828,17 @@ static void zend_compile_with(zend_ast *ast)
 	}
 	zend_emit_op(&manager, ZEND_INIT_WITH, &manager, NULL);
 
+
 	/* $var = manager->enterContext() */
 	zend_emit_copy_tmp(&tmp, &manager);
 	zend_ast *enter_ast = zend_ast_create(ZEND_AST_METHOD_CALL,
 			zend_ast_create_znode(&tmp),
 			zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_ENTER_CONTEXT)),
 			zend_ast_create_list(0, ZEND_AST_ARG_LIST));
 	if (var_ast) {
+		if (var_ast->kind != ZEND_AST_VAR) {
+			zend_throw_error(NULL, "TODO: support non-var on right side of 'as'");
+		}
 		zend_compile_assign(&tmp, zend_ast_create(ZEND_AST_ASSIGN, var_ast, enter_ast));
 	} else {
 		zend_compile_method_call(&tmp, enter_ast, BP_VAR_R);
@@ -5883,9 +5887,7 @@ static void zend_compile_with(zend_ast *ast)
 	znode closed;
 	zend_emit_op_tmp(&closed, ZEND_QM_ASSIGN, &false_node, NULL);
 
-	if (var_ast && var_ast->kind != ZEND_AST_VAR) {
-		zend_throw_error(NULL, "TODO: support non-var on right side of 'as'");
-	}
+	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_WITH);
 
 	zend_ast *catch_list = zend_ast_create_list(1, ZEND_AST_CATCH_LIST,
 			/* } catch (Exception exception) { */
@@ -5940,6 +5942,8 @@ static void zend_compile_with(zend_ast *ast)
 	}
 
 	zend_compile_try(zend_ast_create(ZEND_AST_TRY, stmts_ast, catch_list, finally_stmt));
+
+	zend_end_loop(get_next_op_number(), NULL);
 }
 
 static void zend_compile_echo(zend_ast *ast) /* {{{ */
@@ -6017,27 +6021,30 @@ static void zend_compile_break_continue(zend_ast *ast) /* {{{ */
 			ZEND_ASSERT(cur != -1);
 		}
 
-		if (CG(context).brk_cont_array[cur].is_switch) {
+		if (CG(context).brk_cont_array[cur].kind == ZEND_BRK_CONT_SWITCH
+				|| CG(context).brk_cont_array[cur].kind == ZEND_BRK_CONT_WITH) {
+			const char *keyword = CG(context).brk_cont_array[cur].kind == ZEND_BRK_CONT_SWITCH
+				? "switch" : "with";
 			if (depth == 1) {
 				if (CG(context).brk_cont_array[cur].parent == -1) {
 					zend_error(E_WARNING,
-						"\"continue\" targeting switch is equivalent to \"break\"");
+						"\"continue\" targeting %s is equivalent to \"break\"", keyword);
 				} else {
 					zend_error(E_WARNING,
-						"\"continue\" targeting switch is equivalent to \"break\". " \
+						"\"continue\" targeting %s is equivalent to \"break\". " \
 						"Did you mean to use \"continue " ZEND_LONG_FMT "\"?",
-						depth + 1);
+						keyword, depth + 1);
 				}
 			} else {
 				if (CG(context).brk_cont_array[cur].parent == -1) {
 					zend_error(E_WARNING,
-						"\"continue " ZEND_LONG_FMT "\" targeting switch is equivalent to \"break " ZEND_LONG_FMT "\"",
-						depth, depth);
+						"\"continue " ZEND_LONG_FMT "\" targeting %s is equivalent to \"break " ZEND_LONG_FMT "\"",
+						depth, keyword, depth);
 				} else {
 					zend_error(E_WARNING,
-						"\"continue " ZEND_LONG_FMT "\" targeting switch is equivalent to \"break " ZEND_LONG_FMT "\". " \
+						"\"continue " ZEND_LONG_FMT "\" targeting %s is equivalent to \"break " ZEND_LONG_FMT "\". " \
 						"Did you mean to use \"continue " ZEND_LONG_FMT "\"?",
-						depth, depth, depth + 1);
+						depth, keyword, depth, depth + 1);
 				}
 			}
 		}
@@ -6155,7 +6162,7 @@ static void zend_compile_while(zend_ast *ast) /* {{{ */
 
 	opnum_jmp = zend_emit_jump(0);
 
-	zend_begin_loop(ZEND_NOP, NULL, false);
+	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_DEFAULT);
 
 	opnum_start = get_next_op_number();
 	zend_compile_stmt(stmt_ast);
@@ -6178,7 +6185,7 @@ static void zend_compile_do_while(zend_ast *ast) /* {{{ */
 	znode cond_node;
 	uint32_t opnum_start, opnum_cond;
 
-	zend_begin_loop(ZEND_NOP, NULL, false);
+	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_DEFAULT);
 
 	opnum_start = get_next_op_number();
 	zend_compile_stmt(stmt_ast);
@@ -6235,7 +6242,7 @@ static void zend_compile_for(zend_ast *ast) /* {{{ */
 
 	opnum_jmp = zend_emit_jump(0);
 
-	zend_begin_loop(ZEND_NOP, NULL, false);
+	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_DEFAULT);
 
 	opnum_start = get_next_op_number();
 	zend_compile_stmt(stmt_ast);
@@ -6297,7 +6304,7 @@ static void zend_compile_foreach(zend_ast *ast) /* {{{ */
 	opnum_reset = get_next_op_number();
 	opline = zend_emit_op(&reset_node, by_ref ? ZEND_FE_RESET_RW : ZEND_FE_RESET_R, &expr_node, NULL);
 
-	zend_begin_loop(ZEND_FE_FREE, &reset_node, false);
+	zend_begin_loop(ZEND_FE_FREE, &reset_node, ZEND_BRK_CONT_DEFAULT);
 
 	opnum_fetch = get_next_op_number();
 	opline = zend_emit_op(NULL, by_ref ? ZEND_FE_FETCH_RW : ZEND_FE_FETCH_R, &reset_node, NULL);
@@ -6470,7 +6477,7 @@ static void zend_compile_switch(zend_ast *ast) /* {{{ */
 
 	zend_compile_expr(&expr_node, expr_ast);
 
-	zend_begin_loop(ZEND_FREE, &expr_node, true);
+	zend_begin_loop(ZEND_FREE, &expr_node, ZEND_BRK_CONT_SWITCH);
 
 	case_node.op_type = IS_TMP_VAR;
 	case_node.u.op.var = get_temporary_variable();

Zend/zend_compile.h

@@ -156,13 +156,18 @@ struct _zend_op {
 #endif
 };
 
+typedef enum _zend_brk_cont_kind {
+	ZEND_BRK_CONT_DEFAULT,
+	ZEND_BRK_CONT_SWITCH,
+	ZEND_BRK_CONT_WITH,
+} zend_brk_cont_kind;
 
 typedef struct _zend_brk_cont_element {
 	int start;
 	int cont;
 	int brk;
 	int parent;
-	bool is_switch;
+	zend_brk_cont_kind kind;
 } zend_brk_cont_element;
 
 typedef struct _zend_label {