diff options
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 654c539d27..95b9693816 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1441,7 +1441,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify } /* }}} */ -uint32_t zend_get_class_fetch_type(zend_string *name) /* {{{ */ +uint32_t zend_get_class_fetch_type(zend_string *name) /* {{{ */ { if (zend_string_equals_literal_ci(name, "self")) { return ZEND_FETCH_CLASS_SELF; @@ -1642,7 +1642,7 @@ static inline zend_bool zend_string_equals_str_ci(zend_string *str1, zend_string } /* }}} */ -static void zend_adjust_for_fetch_type(zend_op *opline, uint32_t type) /* {{{ */ +static void zend_adjust_for_fetch_type(zend_op *opline, uint32_t type) /* {{{ */ { switch (type & BP_VAR_MASK) { case BP_VAR_R: @@ -1669,7 +1669,7 @@ static void zend_adjust_for_fetch_type(zend_op *opline, uint32_t type) /* {{{ */ } /* }}} */ -static inline void zend_make_var_result(znode *result, zend_op *opline) /* {{{ */ +static inline void zend_make_var_result(znode *result, zend_op *opline) /* {{{ */ { opline->result_type = IS_VAR; opline->result.var = get_temporary_variable(CG(active_op_array)); @@ -1685,7 +1685,7 @@ static inline void zend_make_tmp_result(znode *result, zend_op *opline) /* {{{ * } /* }}} */ -static zend_op *zend_emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2) /* {{{ */ +static zend_op *zend_emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array)); opline->opcode = opcode; @@ -1787,7 +1787,7 @@ static inline void zend_update_jump_target(uint32_t opnum_jump, uint32_t opnum_t } /* }}} */ -static inline void zend_update_jump_target_to_next(uint32_t opnum_jump) /* {{{ */ +static inline void zend_update_jump_target_to_next(uint32_t opnum_jump) /* {{{ */ { zend_update_jump_target(opnum_jump, get_next_op_number(CG(active_op_array))); } @@ -1952,7 +1952,7 @@ static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast) /* {{{ } /* }}} */ -static int zend_try_compile_cv(znode *result, zend_ast *ast) /* {{{ */ +static int zend_try_compile_cv(znode *result, zend_ast *ast) /* {{{ */ { zend_ast *name_ast = ast->child[0]; if (name_ast->kind == ZEND_AST_ZVAL) { @@ -2423,7 +2423,7 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ if (arg->kind == ZEND_AST_UNPACK) { uses_arg_unpack = 1; fbc = NULL; - + zend_compile_expr(&arg_node, arg->child[0]); opline = zend_emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL); opline->op2.num = arg_count; @@ -2618,7 +2618,7 @@ int zend_compile_func_typecheck(znode *result, zend_ast_list *args, uint32_t typ if (args->children != 1 || args->child[0]->kind == ZEND_AST_UNPACK) { return FAILURE; } - + zend_compile_expr(&arg_node, args->child[0]); opline = zend_emit_op_tmp(result, ZEND_TYPE_CHECK, &arg_node, NULL); opline->extended_value = type; @@ -2878,7 +2878,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ zend_compile_expr(&method_node, method_ast); opline = zend_emit_op(NULL, ZEND_INIT_METHOD_CALL, &obj_node, NULL); - + if (method_node.op_type == IS_CONST) { if (Z_TYPE(method_node.u.constant) != IS_STRING) { zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); @@ -3451,7 +3451,7 @@ void zend_compile_if(zend_ast *ast) /* {{{ */ zend_ast_list *list = zend_ast_get_list(ast); uint32_t i; uint32_t *jmp_opnums = NULL; - + if (list->children > 1) { jmp_opnums = safe_emalloc(sizeof(uint32_t), list->children - 1, 0); } @@ -3786,7 +3786,7 @@ void zend_compile_params(zend_ast *ast) /* {{{ */ if (list->children == 0) { return; } - + arg_infos = safe_emalloc(sizeof(zend_arg_info), list->children, 0); for (i = 0; i < list->children; ++i) { zend_ast *param_ast = list->child[i]; @@ -3907,7 +3907,7 @@ void zend_compile_params(zend_ast *ast) /* {{{ */ /* Don't count the variadic argument */ if (op_array->fn_flags & ZEND_ACC_VARIADIC) { op_array->num_args--; - } + } } /* }}} */ @@ -4166,7 +4166,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast) /* {{{ */ zend_op_array *op_array = zend_arena_alloc(&CG(arena), sizeof(zend_op_array)); // TODO.AST interactive (not just here - also bpc etc!) - + init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE); op_array->fn_flags |= decl->flags; @@ -4355,7 +4355,7 @@ static void zend_compile_trait_precedence(zend_ast *ast) /* {{{ */ { zend_ast *method_ref_ast = ast->child[0]; zend_ast *insteadof_ast = ast->child[1]; - + zend_trait_precedence *precedence = emalloc(sizeof(zend_trait_precedence)); precedence->trait_method = zend_compile_method_ref(method_ref_ast); precedence->exclude_from_classes @@ -5313,7 +5313,7 @@ void zend_compile_conditional(znode *result, zend_ast *ast) /* {{{ */ zend_compile_shorthand_conditional(result, ast); return; } - + zend_compile_expr(&cond_node, cond_ast); opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0); @@ -5876,7 +5876,7 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr) /* {{{ */ zend_error_noreturn(E_COMPILE_ERROR, "\"static::\" is not allowed in compile-time constants"); } - + if (ZEND_FETCH_CLASS_DEFAULT == fetch_type) { class_name = zend_resolve_class_name_ast(class_ast); } else { |