Add Set::merge

Author: rtheunissen

src/ds/ds_set.c

@@ -247,6 +247,18 @@ ds_set_t *ds_set_union(ds_set_t *set, ds_set_t *other)
     return ds_set_ex(ds_htable_merge(set->table, other->table));
 }
 
+ds_set_t *ds_set_merge(ds_set_t *set, zval *values)
+{
+    if (values && (ds_is_array(values) || ds_is_traversable(values))) {
+        ds_set_t *merged = ds_set_clone(set);
+        ds_set_add_all(merged, values);
+        return merged;
+    }
+
+    ARRAY_OR_TRAVERSABLE_REQUIRED();
+    return NULL;
+}
+
 void ds_set_assign_union(ds_set_t *set, ds_set_t *other)
 {
     zval *value;

src/ds/ds_set.h

@@ -57,6 +57,7 @@ ds_set_t *ds_set_diff(ds_set_t *set, ds_set_t *other);
 ds_set_t *ds_set_intersect(ds_set_t *set, ds_set_t *other);
 ds_set_t *ds_set_xor(ds_set_t *set, ds_set_t *other);
 ds_set_t *ds_set_union(ds_set_t *set, ds_set_t *other);
+ds_set_t *ds_set_merge(ds_set_t *set, zval *values);
 
 void ds_set_assign_diff(ds_set_t *set, ds_set_t *other);
 void ds_set_assign_intersect(ds_set_t *set, ds_set_t *other);

src/php/classes/php_set_ce.c

@@ -113,6 +113,13 @@ METHOD(last)
     RETURN_ZVAL_COPY(ds_set_get_last(THIS_DS_SET()));
 }
 
+ARGINFO_ZVAL_RETURN_DS(merge, values, Set)
+METHOD(merge)
+{
+    PARSE_ZVAL(values);
+    RETURN_DS_SET(ds_set_merge(THIS_DS_SET(), values));
+}
+
 ARGINFO_DS_RETURN_DS(union, set, Set, Set)
 METHOD(union)
 {
@@ -254,6 +261,7 @@ void php_ds_register_set()
         PHP_DS_ME(Set, intersect)
         PHP_DS_ME(Set, join)
         PHP_DS_ME(Set, last)
+        PHP_DS_ME(Set, merge)
         PHP_DS_ME(Set, reduce)
         PHP_DS_ME(Set, remove)
         PHP_DS_ME(Set, reverse)

src/php/classes/php_vector_ce.c

@@ -257,20 +257,13 @@ METHOD(unshift)
     ds_vector_unshift_va(THIS_DS_VECTOR(), argc, argv);
 }
 
-ARGINFO_ZVAL(
-    push_one, value
-);
-
 void php_ds_register_vector()
 {
     zend_class_entry ce;
 
     zend_function_entry methods[] = {
         SEQUENCE_ME_LIST(Vector)
         PHP_DS_COLLECTION_ME_LIST(Vector)
-
-        PHP_ME(Vector, push_one, arginfo_push_one, ZEND_ACC_PUBLIC)
-
         PHP_FE_END
     };