Skip to content

Commit 7d809db

Browse files
committed
remove formatting changes
1 parent 3ef6c42 commit 7d809db

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

Zend/zend_compile.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ static void zend_do_free(znode *op1) /* {{{ */
757757
zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
758758

759759
while (opline->opcode == ZEND_END_SILENCE ||
760-
opline->opcode == ZEND_OP_DATA) {
760+
opline->opcode == ZEND_OP_DATA) {
761761
opline--;
762762
}
763763

@@ -821,9 +821,9 @@ static void zend_do_free(znode *op1) /* {{{ */
821821
} else {
822822
while (opline >= CG(active_op_array)->opcodes) {
823823
if ((opline->opcode == ZEND_FETCH_LIST_R ||
824-
opline->opcode == ZEND_FETCH_LIST_W) &&
825-
opline->op1_type == IS_VAR &&
826-
opline->op1.var == op1->u.op.var) {
824+
opline->opcode == ZEND_FETCH_LIST_W) &&
825+
opline->op1_type == IS_VAR &&
826+
opline->op1.var == op1->u.op.var) {
827827
zend_emit_op(NULL, ZEND_FREE, op1, NULL);
828828
return;
829829
}
@@ -2972,7 +2972,7 @@ static zend_op *zend_compile_simple_var_no_cv(znode *result, zend_ast *ast, uint
29722972
}
29732973

29742974
if (name_node.op_type == IS_CONST &&
2975-
zend_is_auto_global(Z_STR(name_node.u.constant))) {
2975+
zend_is_auto_global(Z_STR(name_node.u.constant))) {
29762976

29772977
opline->extended_value = ZEND_FETCH_GLOBAL;
29782978
} else {
@@ -3992,7 +3992,7 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, zend_fun
39923992
opline->extended_value = 0;
39933993

39943994
if (opline->opcode == ZEND_NEW) {
3995-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot create Closure for new expression");
3995+
zend_error_noreturn(E_COMPILE_ERROR, "Cannot create Closure for new expression");
39963996
}
39973997

39983998
if (opline->opcode == ZEND_INIT_FCALL) {
@@ -4324,7 +4324,7 @@ static zend_result zend_compile_func_cufa(znode *result, zend_ast_list *args, ze
43244324
zend_string *name = zend_resolve_function_name(orig_name, args->child[1]->child[0]->attr, &is_fully_qualified);
43254325

43264326
if (zend_string_equals_literal_ci(name, "array_slice")
4327-
&& !zend_args_contain_unpack_or_named(list)
4327+
&& !zend_args_contain_unpack_or_named(list)
43284328
&& list->children == 3
43294329
&& list->child[1]->kind == ZEND_AST_ZVAL) {
43304330
zval *zv = zend_ast_get_zval(list->child[1]);
@@ -5213,7 +5213,7 @@ static void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{
52135213
}
52145214

52155215
if (!is_callable_convert &&
5216-
zend_try_compile_special_func(result, lcname,
5216+
zend_try_compile_special_func(result, lcname,
52175217
zend_ast_get_list(args_ast), fbc, type) == SUCCESS
52185218
) {
52195219
zend_string_release_ex(lcname, 0);
@@ -5659,7 +5659,7 @@ static bool zend_handle_loops_and_finally_ex(zend_long depth, znode *return_valu
56595659
opline->op1.var = loop_var->var_num;
56605660
opline->extended_value = ZEND_FREE_ON_RETURN;
56615661
depth--;
5662-
}
5662+
}
56635663
}
56645664
return (depth == 0);
56655665
}
@@ -5691,7 +5691,7 @@ static bool zend_has_finally_ex(zend_long depth) /* {{{ */
56915691
return 0;
56925692
} else {
56935693
depth--;
5694-
}
5694+
}
56955695
}
56965696
return 0;
56975697
}
@@ -5875,7 +5875,7 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline) /* {{{ */
58755875

58765876
label = CT_CONSTANT_EX(op_array, opline->op2.constant);
58775877
if (CG(context).labels == NULL ||
5878-
(dest = zend_hash_find_ptr(CG(context).labels, Z_STR_P(label))) == NULL
5878+
(dest = zend_hash_find_ptr(CG(context).labels, Z_STR_P(label))) == NULL
58795879
) {
58805880
CG(in_compilation) = 1;
58815881
CG(active_op_array) = op_array;
@@ -7013,7 +7013,7 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
70137013
if (type_code == IS_ITERABLE) {
70147014
/* Set iterable bit for BC compat during Reflection and string representation of type */
70157015
zend_type iterable = (zend_type) ZEND_TYPE_INIT_CLASS_MASK(ZSTR_KNOWN(ZEND_STR_TRAVERSABLE),
7016-
(MAY_BE_ARRAY|_ZEND_TYPE_ITERABLE_BIT));
7016+
(MAY_BE_ARRAY|_ZEND_TYPE_ITERABLE_BIT));
70177017
return iterable;
70187018
}
70197019

@@ -7431,9 +7431,9 @@ static void zend_compile_attributes(
74317431
zend_ast *el = group->child[i];
74327432

74337433
if (el->child[1] &&
7434-
el->child[1]->kind == ZEND_AST_CALLABLE_CONVERT) {
7435-
zend_error_noreturn(E_COMPILE_ERROR,
7436-
"Cannot create Closure as attribute argument");
7434+
el->child[1]->kind == ZEND_AST_CALLABLE_CONVERT) {
7435+
zend_error_noreturn(E_COMPILE_ERROR,
7436+
"Cannot create Closure as attribute argument");
74377437
}
74387438

74397439
zend_string *name = zend_resolve_class_name_ast(el->child[0]);
@@ -9854,8 +9854,8 @@ ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, const zval *op1, co
98549854
}
98559855

98569856
if (!(opcode == ZEND_ADD || opcode == ZEND_SUB || opcode == ZEND_MUL || opcode == ZEND_DIV
9857-
|| opcode == ZEND_POW || opcode == ZEND_MOD || opcode == ZEND_SL || opcode == ZEND_SR
9858-
|| opcode == ZEND_BW_OR || opcode == ZEND_BW_AND || opcode == ZEND_BW_XOR)) {
9857+
|| opcode == ZEND_POW || opcode == ZEND_MOD || opcode == ZEND_SL || opcode == ZEND_SR
9858+
|| opcode == ZEND_BW_OR || opcode == ZEND_BW_AND || opcode == ZEND_BW_XOR)) {
98599859
/* Only the numeric operations throw errors. */
98609860
return 0;
98619861
}
@@ -11121,11 +11121,11 @@ static void zend_compile_rope_finalize(znode *result, uint32_t rope_elements, ze
1112111121
while (opline != init_opline) {
1112211122
opline--;
1112311123
if (opline->opcode == ZEND_ROPE_ADD &&
11124-
opline->result.var == (uint32_t)-1) {
11124+
opline->result.var == (uint32_t)-1) {
1112511125
opline->op1.var = var;
1112611126
opline->result.var = var;
1112711127
} else if (opline->opcode == ZEND_ROPE_INIT &&
11128-
opline->result.var == (uint32_t)-1) {
11128+
opline->result.var == (uint32_t)-1) {
1112911129
opline->result.var = var;
1113011130
}
1113111131
}
@@ -11221,8 +11221,8 @@ static void zend_compile_magic_const(znode *result, zend_ast *ast) /* {{{ */
1122111221
}
1122211222

1122311223
ZEND_ASSERT(ast->attr == T_CLASS_C &&
11224-
CG(active_class_entry) &&
11225-
(CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) != 0);
11224+
CG(active_class_entry) &&
11225+
(CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) != 0);
1122611226

1122711227
opline = zend_emit_op_tmp(result, ZEND_FETCH_CLASS_NAME, NULL, NULL);
1122811228
opline->op1.num = ZEND_FETCH_CLASS_SELF;

0 commit comments

Comments
 (0)