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

Add macro. Update travis.yml(`make test` buggy on travis)

This commit is contained in:
CismonX 2018-05-05 20:22:11 +08:00
parent a57c1ba965
commit 570a03b943
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -14,4 +14,6 @@ script:
- phpize - phpize
- ./configure - ./configure
- make - make
- make test
after_success:
- make test

17
src/collections_methods.c
View File

@ -5,7 +5,6 @@
// //
#include <php.h> #include <php.h>
#include <stdint.h>
#include "php_collections.h" #include "php_collections.h"
#include "php_collections_me.h" #include "php_collections_me.h"
@ -68,6 +67,10 @@
else \ else \
equal_check_func = fast_equal_check_function; equal_check_func = fast_equal_check_function;
#define ADDREF_IF_REFCOUNTED(val) \
if (Z_REFCOUNTED(val)) \
GC_ADDREF(Z_COUNTED(val))
#define PHP_COLLECTIONS_ERROR(type, msg) php_error_docref(NULL, type, msg) #define PHP_COLLECTIONS_ERROR(type, msg) php_error_docref(NULL, type, msg)
#define ERR_BAD_ARGUMENT_TYPE() PHP_COLLECTIONS_ERROR(E_WARNING, "Bad argument type") #define ERR_BAD_ARGUMENT_TYPE() PHP_COLLECTIONS_ERROR(E_WARNING, "Bad argument type")
#define ERR_BAD_KEY_TYPE() PHP_COLLECTIONS_ERROR(E_WARNING, "Key must be integer or string") #define ERR_BAD_KEY_TYPE() PHP_COLLECTIONS_ERROR(E_WARNING, "Key must be integer or string")
@ -500,8 +503,7 @@ PHP_METHOD(Collection, drop)
if (Z_ISUNDEF(bucket->val)) if (Z_ISUNDEF(bucket->val))
continue; continue;
--n; --n;
if (Z_REFCOUNTED(bucket->val)) ADDREF_IF_REFCOUNTED(bucket->val);
GC_ADDREF(Z_COUNTED(bucket->val));
zend_hash_del_bucket(new_collection, bucket); zend_hash_del_bucket(new_collection, bucket);
} }
RETVAL_NEW_COLLECTION(new_collection); RETVAL_NEW_COLLECTION(new_collection);
@ -525,8 +527,7 @@ PHP_METHOD(Collection, dropLast)
if (Z_ISUNDEF(bucket->val)) if (Z_ISUNDEF(bucket->val))
continue; continue;
--n; --n;
if (Z_REFCOUNTED(bucket->val)) ADDREF_IF_REFCOUNTED(bucket->val);
GC_ADDREF(Z_COUNTED(bucket->val));
zend_hash_del_bucket(new_collection, bucket); zend_hash_del_bucket(new_collection, bucket);
} }
RETVAL_NEW_COLLECTION(new_collection); RETVAL_NEW_COLLECTION(new_collection);
@ -728,8 +729,7 @@ PHP_METHOD(Collection, flatMap)
zval* retval_p = &retval; zval* retval_p = &retval;
ELEMENTS_VALIDATE(retval_p, ERR_BAD_CALLBACK_RETVAL, continue); ELEMENTS_VALIDATE(retval_p, ERR_BAD_CALLBACK_RETVAL, continue);
ZEND_HASH_FOREACH_BUCKET(retval_p_arr, Bucket* bucket) ZEND_HASH_FOREACH_BUCKET(retval_p_arr, Bucket* bucket)
if (Z_REFCOUNTED(bucket->val)) ADDREF_IF_REFCOUNTED(bucket->val);
GC_ADDREF(Z_COUNTED(bucket->val));
if (bucket->key) if (bucket->key)
zend_hash_add(new_collection, bucket->key, &bucket->val); zend_hash_add(new_collection, bucket->key, &bucket->val);
else else
@ -758,8 +758,7 @@ PHP_METHOD(Collection, flatMapTo)
zval* retval_p = &retval; zval* retval_p = &retval;
ELEMENTS_VALIDATE(retval_p, ERR_BAD_CALLBACK_RETVAL, continue); ELEMENTS_VALIDATE(retval_p, ERR_BAD_CALLBACK_RETVAL, continue);
ZEND_HASH_FOREACH_BUCKET(retval_p_arr, Bucket* bucket) ZEND_HASH_FOREACH_BUCKET(retval_p_arr, Bucket* bucket)
if (Z_REFCOUNTED(bucket->val)) ADDREF_IF_REFCOUNTED(bucket->val);
GC_ADDREF(Z_COUNTED(bucket->val));
if (bucket->key) if (bucket->key)
zend_hash_add(dest_arr, bucket->key, &bucket->val); zend_hash_add(dest_arr, bucket->key, &bucket->val);
else else