archived
/
ext-collections
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor code

This commit is contained in:
CismonX 2018-10-11 18:53:39 +08:00
parent 28e2cef92c
commit 60ae083093
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/collections.c
View File

@ -17,6 +17,10 @@
zend_declare_class_constant_long(collections_##cls##_ce, name, sizeof(name) - 1, val) zend_declare_class_constant_long(collections_##cls##_ce, name, sizeof(name) - 1, val)
#define COLLECTIONS_PROP_DECLARE(cls, name, flags) \ #define COLLECTIONS_PROP_DECLARE(cls, name, flags) \
zend_declare_property_null(collections_##cls##_ce, name, sizeof(name) - 1, flags) zend_declare_property_null(collections_##cls##_ce, name, sizeof(name) - 1, flags)
#define COLLECTIONS_HANDLERS_INIT(cls) \
memcpy(&cls##_handlers, &std_object_handlers, sizeof(zend_object_handlers))
#define COLLECTIONS_HANDLER_SET(cls, name) \
cls##_handlers.name = cls##_##name
zend_object_handlers collection_handlers; zend_object_handlers collection_handlers;
@ -41,16 +45,16 @@ static zend_always_inline void collection_ce_init()
2, zend_ce_countable, 2, zend_ce_countable,
#endif #endif
zend_ce_arrayaccess); zend_ce_arrayaccess);
memcpy(&collection_handlers, &std_object_handlers, sizeof(zend_object_handlers)); COLLECTIONS_HANDLERS_INIT(collection);
collection_handlers.unset_dimension = collection_offset_unset; COLLECTIONS_HANDLER_SET(collection, count_elements);
collection_handlers.unset_property = collection_property_unset; COLLECTIONS_HANDLER_SET(collection, has_dimension);
collection_handlers.write_dimension = collection_offset_set; COLLECTIONS_HANDLER_SET(collection, write_dimension);
collection_handlers.write_property = collection_property_set; COLLECTIONS_HANDLER_SET(collection, read_dimension);
collection_handlers.read_dimension = collection_offset_get; COLLECTIONS_HANDLER_SET(collection, unset_dimension);
collection_handlers.read_property = collection_property_get; COLLECTIONS_HANDLER_SET(collection, has_property);
collection_handlers.has_dimension = collection_offset_exists; COLLECTIONS_HANDLER_SET(collection, write_property);
collection_handlers.has_property = collection_property_exists; COLLECTIONS_HANDLER_SET(collection, read_property);
collection_handlers.count_elements = count_collection; COLLECTIONS_HANDLER_SET(collection, unset_property);
} }
static zend_always_inline void pair_ce_init() static zend_always_inline void pair_ce_init()

40
src/collections_methods.c
View File

@ -624,19 +624,19 @@ static zend_always_inline void array_slice_by(zend_array* ht, zend_array* other,
free(ref_other); free(ref_other);
} }
int count_collection(zval* obj, zend_long* count) int collection_count_elements(zval* obj, zend_long* count)
{ {
zend_array* current = Z_COLLECTION_P(obj); zend_array* current = Z_COLLECTION_P(obj);
*count = zend_hash_num_elements(current); *count = zend_hash_num_elements(current);
return SUCCESS; return SUCCESS;
} }
int collection_offset_exists(zval* object, zval* offset, int check_empty) int collection_has_dimension(zval* object, zval* offset, int check_empty)
{ {
zend_array* current = Z_COLLECTION_P(object); zend_array* current = Z_COLLECTION_P(object);
if (check_empty) { if (check_empty) {
zval result; zval result;
return zend_is_true(collection_offset_get(object, offset, 0, &result)); return zend_is_true(collection_read_dimension(object, offset, 0, &result));
} }
if (Z_TYPE_P(offset) == IS_LONG) { if (Z_TYPE_P(offset) == IS_LONG) {
return zend_hash_index_exists(current, Z_LVAL_P(offset)); return zend_hash_index_exists(current, Z_LVAL_P(offset));
@ -647,7 +647,7 @@ int collection_offset_exists(zval* object, zval* offset, int check_empty)
return 0; return 0;
} }
int collection_property_exists(zval* object, zval* member, int has_set_exists, int collection_has_property(zval* object, zval* member, int has_set_exists,
void** unused) void** unused)
{ {
zend_array* current = Z_COLLECTION_P(object); zend_array* current = Z_COLLECTION_P(object);
@ -671,7 +671,7 @@ int collection_property_exists(zval* object, zval* member, int has_set_exists,
return 1; return 1;
} }
void collection_offset_set(zval* object, zval* offset, zval* value) void collection_write_dimension(zval* object, zval* offset, zval* value)
{ {
zend_array* current = Z_COLLECTION_P(object); zend_array* current = Z_COLLECTION_P(object);
SEPARATE_COLLECTION(current, object); SEPARATE_COLLECTION(current, object);
@ -686,12 +686,12 @@ void collection_offset_set(zval* object, zval* offset, zval* value)
Z_TRY_ADDREF_P(value); Z_TRY_ADDREF_P(value);
} }
void collection_property_set(zval* object, zval* member, zval* value, void** unused) void collection_write_property(zval* object, zval* member, zval* value, void** unused)
{ {
collection_offset_set(object, member, value); collection_write_dimension(object, member, value);
} }
zval* collection_offset_get(zval* object, zval* offset, int type, zval* retval) zval* collection_read_dimension(zval* object, zval* offset, int type, zval* rv)
{ {
// Note that we don't handle type. So don't do any fancy things with Collection // Note that we don't handle type. So don't do any fancy things with Collection
// such as fetching a reference of a value, etc. // such as fetching a reference of a value, etc.
@ -701,21 +701,16 @@ zval* collection_offset_get(zval* object, zval* offset, int type, zval* retval)
found = zend_hash_index_find(current, Z_LVAL_P(offset)); found = zend_hash_index_find(current, Z_LVAL_P(offset));
} else if (Z_TYPE_P(offset) == IS_STRING) { } else if (Z_TYPE_P(offset) == IS_STRING) {
found = zend_hash_find(current, Z_STR_P(offset)); found = zend_hash_find(current, Z_STR_P(offset));
} if (found) {
ZVAL_COPY_VALUE(retval, found);
} else {
retval = &EG(uninitialized_zval);
} }
return retval; return found ? found : &EG(uninitialized_zval);
} }
zval* collection_property_get(zval* object, zval* member, int type, void** unused, zval* collection_read_property(zval* object, zval* member, int type, void** unused, zval* rv)
zval* retval)
{ {
return collection_offset_get(object, member, type, retval); return collection_read_dimension(object, member, type, NULL);
} }
void collection_offset_unset(zval* object, zval* offset) void collection_unset_dimension(zval* object, zval* offset)
{ {
zend_array* current = Z_COLLECTION_P(object); zend_array* current = Z_COLLECTION_P(object);
SEPARATE_COLLECTION(current, object); SEPARATE_COLLECTION(current, object);
@ -726,9 +721,9 @@ void collection_offset_unset(zval* object, zval* offset)
} }
} }
void collection_property_unset(zval* object, zval* member, void** unused) void collection_unset_property(zval* object, zval* member, void** unused)
{ {
collection_offset_unset(object, member); collection_unset_dimension(object, member);
} }
PHP_METHOD(Collection, __construct) {} PHP_METHOD(Collection, __construct) {}
@ -1275,7 +1270,7 @@ PHP_METHOD(Collection, copyOfRange)
PHP_METHOD(Collection, count) PHP_METHOD(Collection, count)
{ {
zend_long count; zend_long count;
count_collection(getThis(), &count); collection_count_elements(getThis(), &count);
RETVAL_LONG(count); RETVAL_LONG(count);
} }
@ -3278,6 +3273,7 @@ PHP_METHOD(Pair, __construct)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
Z_TRY_ADDREF_P(first); Z_TRY_ADDREF_P(first);
Z_TRY_ADDREF_P(second); Z_TRY_ADDREF_P(second);
pair_update_first(Z_OBJ_P(getThis()), first); zend_object* current = Z_OBJ_P(getThis());
pair_update_second(Z_OBJ_P(getThis()), second); pair_update_first(current, first);
pair_update_second(current, second);
} }

18
src/php_collections.h
View File

@ -56,15 +56,15 @@ extern PHP_COLLECTIONS_API zend_class_entry* collections_pair_ce;
extern zend_object_handlers collection_handlers; extern zend_object_handlers collection_handlers;
int count_collection(zval* obj, zend_long* count); int collection_count_elements(zval* obj, zend_long* count);
int collection_offset_exists(zval* object, zval* offset, int check_empty); int collection_has_dimension(zval* object, zval* offset, int check_empty);
void collection_offset_set(zval* object, zval* offset, zval* value); void collection_write_dimension(zval* object, zval* offset, zval* value);
zval* collection_offset_get(zval* object, zval* offset, int type, zval* retval); zval* collection_read_dimension(zval* object, zval* offset, int type, zval* rv);
void collection_offset_unset(zval* object, zval* offset); void collection_unset_dimension(zval* object, zval* offset);
int collection_property_exists(zval* object, zval* member, int has_set_exists, void**); int collection_has_property(zval* object, zval* member, int has_set_exists, void**);
void collection_property_set(zval* object, zval* member, zval* value, void**); void collection_write_property(zval* object, zval* member, zval* value, void**);
zval* collection_property_get(zval* object, zval* member, int type, void**, zval* retval); zval* collection_read_property(zval* object, zval* member, int type, void**, zval* rv);
void collection_property_unset(zval* object, zval* member, void**); void collection_unset_property(zval* object, zval* member, void**);
extern const zend_function_entry collection_methods[]; extern const zend_function_entry collection_methods[];
extern const zend_function_entry pair_methods[]; extern const zend_function_entry pair_methods[];