cvs: ZendEngine2 / zend_closures.c

jani Tue Jul 22 07:39:40 2008 UTC Modified files: /ZendEngine2 zend_closures.c Log: ws http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_closures.c?r1=1.5&r2=1.6&diff_format=u Index: ZendEngine2/zend_closures.c diff -u ZendEngine2/zend_closures.c:1.5 ZendEngine2/zend_closures.c:1.6 --- ZendEngine2/zend_closures.c:1.5 Tue Jul 22 07:29:14 2008 +++ ZendEngine2/zend_closures.c Tue Jul 22 07:39:40 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_closures.c,v 1.5 2008/07/22 07:29:14 dmitry Exp $ */ +/* $Id: zend_closures.c,v 1.6 2008/07/22 07:39:40 jani Exp $ */ #include "zend.h" #include "zend_API.h" @@ -125,7 +125,8 @@ /* Create a zend_copy_str_tolower(dest, src, src_length); */ lc_name = zend_u_str_case_fold(type, method_name, method_len, 1, &lc_name_len); if ((lc_name_len == sizeof(ZEND_INVOKE_FUNC_NAME)-1) && - (ZEND_U_EQUAL(type, lc_name, lc_name_len, ZEND_INVOKE_FUNC_NAME, sizeof(ZEND_INVOKE_FUNC_NAME)-1))) { + (ZEND_U_EQUAL(type, lc_name, lc_name_len, ZEND_INVOKE_FUNC_NAME, sizeof(ZEND_INVOKE_FUNC_NAME)-1)) + ) { zend_closure *closure = (zend_closure *)zend_object_store_get_object(*object_ptr TSRMLS_CC); if (!closure->invoke) { @@ -151,34 +152,34 @@ static zval *zend_closure_read_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */ { - ZEND_CLOSURE_PROPERTY_ERROR(); + ZEND_CLOSURE_PROPERTY_ERROR(); return NULL; } /* }}} */ static void zend_closure_write_property(zval *object, zval *member, zval *value TSRMLS_DC) /* {{{ */ { - ZEND_CLOSURE_PROPERTY_ERROR(); + ZEND_CLOSURE_PROPERTY_ERROR(); } /* }}} */ static zval **zend_closure_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) /* {{{ */ { - ZEND_CLOSURE_PROPERTY_ERROR(); + ZEND_CLOSURE_PROPERTY_ERROR(); return NULL; } /* }}} */ static int zend_closure_has_property(zval *object, zval *member, int has_set_exists TSRMLS_DC) /* {{{ */ { - ZEND_CLOSURE_PROPERTY_ERROR(); + ZEND_CLOSURE_PROPERTY_ERROR(); return 0; } /* }}} */ static void zend_closure_unset_property(zval *object, zval *member TSRMLS_DC) /* {{{ */ { - ZEND_CLOSURE_PROPERTY_ERROR(); + ZEND_CLOSURE_PROPERTY_ERROR(); } /* }}} */ @@ -223,10 +224,10 @@ memset(closure, 0, sizeof(zend_closure)); zend_object_std_init(&closure->std, class_type TSRMLS_CC); - + object.handle = zend_objects_store_put(closure, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) zend_closure_free_storage, NULL TSRMLS_CC); object.handlers = &closure_handlers; - + return object; } /* }}} */ @@ -259,7 +260,7 @@ HashTable *target = va_arg(args, HashTable*); zend_bool is_ref; TSRMLS_FETCH(); - + if (Z_TYPE_PP(p) & (IS_LEXICAL_VAR|IS_LEXICAL_REF)) { is_ref = Z_TYPE_PP(p) & IS_LEXICAL_REF; @@ -305,7 +306,7 @@ if (closure->func.type == ZEND_USER_FUNCTION) { if (closure->func.op_array.static_variables) { HashTable *static_variables = closure->func.op_array.static_variables; - + ALLOC_HASHTABLE(closure->func.op_array.static_variables); zend_u_hash_init(closure->func.op_array.static_variables, zend_hash_num_elements(static_variables), NULL, ZVAL_PTR_DTOR, 0, UG(unicode)); zend_hash_apply_with_arguments(static_variables, (apply_func_args_t)zval_copy_static_var, 1, closure->func.op_array.static_variables);