Skip to content

Zend: add type polymorphism to add_{next_}index_TYPE() functions #24628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Girgias wants to merge 2 commits into
base: master
Choose a base branch
from
+332 −86
Draft

Zend: add type polymorphism to add_{next_}index_TYPE() functions #24628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d92af89
Zend: add type polymorphism to add_{next_}index_TYPE() functions
Girgias Oct 16, 2026
3cbc1a3
Show new generic API works in C and C++ mode
Girgias Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2108,201 +2108,201 @@ ZEND_API void add_assoc_zval_ex(zval *arg, const char *key, size_t key_len, zval
}
/* }}} */

ZEND_API void add_index_long(zval *arg, zend_ulong index, zend_long n) /* {{{ */
ZEND_API void add_index_long_ex(HashTable *arg, zend_ulong index, zend_long n) /* {{{ */
{
zval tmp;

ZVAL_LONG(&tmp, n);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_null(zval *arg, zend_ulong index) /* {{{ */
ZEND_API void add_index_null_ex(HashTable *arg, zend_ulong index) /* {{{ */
{
zval tmp;

ZVAL_NULL(&tmp);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_bool(zval *arg, zend_ulong index, bool b) /* {{{ */
ZEND_API void add_index_bool_ex(HashTable *arg, zend_ulong index, bool b) /* {{{ */
{
zval tmp;

ZVAL_BOOL(&tmp, b);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_resource(zval *arg, zend_ulong index, zend_resource *r) /* {{{ */
ZEND_API void add_index_resource_ex(HashTable *arg, zend_ulong index, zend_resource *r) /* {{{ */
{
zval tmp;

ZVAL_RES(&tmp, r);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_double(zval *arg, zend_ulong index, double d) /* {{{ */
ZEND_API void add_index_double_ex(HashTable *arg, zend_ulong index, double d) /* {{{ */
{
zval tmp;

ZVAL_DOUBLE(&tmp, d);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_str(zval *arg, zend_ulong index, zend_string *str) /* {{{ */
ZEND_API void add_index_str_ex(HashTable *arg, zend_ulong index, zend_string *str) /* {{{ */
{
zval tmp;

ZVAL_STR(&tmp, str);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_string(zval *arg, zend_ulong index, const char *str) /* {{{ */
ZEND_API void add_index_string_ex(HashTable *arg, zend_ulong index, const char *str) /* {{{ */
{
zval tmp;

ZVAL_STRING(&tmp, str);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_stringl(zval *arg, zend_ulong index, const char *str, size_t length) /* {{{ */
ZEND_API void add_index_stringl_ex(HashTable *arg, zend_ulong index, const char *str, size_t length) /* {{{ */
{
zval tmp;

ZVAL_STRINGL(&tmp, str, length);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_array(zval *arg, zend_ulong index, zend_array *arr) /* {{{ */
ZEND_API void add_index_array_ex(HashTable *arg, zend_ulong index, zend_array *arr) /* {{{ */
{
zval tmp;

ZVAL_ARR(&tmp, arr);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_object(zval *arg, zend_ulong index, zend_object *obj) /* {{{ */
ZEND_API void add_index_object_ex(HashTable *arg, zend_ulong index, zend_object *obj) /* {{{ */
{
zval tmp;

ZVAL_OBJ(&tmp, obj);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API void add_index_reference(zval *arg, zend_ulong index, zend_reference *ref) /* {{{ */
ZEND_API void add_index_reference_ex(HashTable *arg, zend_ulong index, zend_reference *ref) /* {{{ */
{
zval tmp;

ZVAL_REF(&tmp, ref);
zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp);
zend_hash_index_update(arg, index, &tmp);
}
/* }}} */

ZEND_API zend_result add_next_index_long(zval *arg, zend_long n) /* {{{ */
ZEND_API zend_result add_next_index_long_ex(HashTable *arg, zend_long n) /* {{{ */
{
zval tmp;

ZVAL_LONG(&tmp, n);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_null(zval *arg) /* {{{ */
ZEND_API zend_result add_next_index_null_ex(HashTable *arg) /* {{{ */
{
zval tmp;

ZVAL_NULL(&tmp);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_bool(zval *arg, bool b) /* {{{ */
ZEND_API zend_result add_next_index_bool_ex(HashTable *arg, bool b) /* {{{ */
{
zval tmp;

ZVAL_BOOL(&tmp, b);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_resource(zval *arg, zend_resource *r) /* {{{ */
ZEND_API zend_result add_next_index_resource_ex(HashTable *arg, zend_resource *r) /* {{{ */
{
zval tmp;

ZVAL_RES(&tmp, r);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_double(zval *arg, double d) /* {{{ */
ZEND_API zend_result add_next_index_double_ex(HashTable *arg, double d) /* {{{ */
{
zval tmp;

ZVAL_DOUBLE(&tmp, d);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_str(zval *arg, zend_string *str) /* {{{ */
ZEND_API zend_result add_next_index_str_ex(HashTable *arg, zend_string *str) /* {{{ */
{
zval tmp;

ZVAL_STR(&tmp, str);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_string(zval *arg, const char *str) /* {{{ */
ZEND_API zend_result add_next_index_string_ex(HashTable *arg, const char *str) /* {{{ */
{
zval tmp;

ZVAL_STRING(&tmp, str);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_stringl(zval *arg, const char *str, size_t length) /* {{{ */
ZEND_API zend_result add_next_index_stringl_ex(HashTable *arg, const char *str, size_t length) /* {{{ */
{
zval tmp;

ZVAL_STRINGL(&tmp, str, length);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_array(zval *arg, zend_array *arr) /* {{{ */
ZEND_API zend_result add_next_index_array_ex(HashTable *arg, zend_array *arr) /* {{{ */
{
zval tmp;

ZVAL_ARR(&tmp, arr);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_object(zval *arg, zend_object *obj) /* {{{ */
ZEND_API zend_result add_next_index_object_ex(HashTable *arg, zend_object *obj) /* {{{ */
{
zval tmp;

ZVAL_OBJ(&tmp, obj);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

ZEND_API zend_result add_next_index_reference(zval *arg, zend_reference *ref) /* {{{ */
ZEND_API zend_result add_next_index_reference_ex(HashTable *arg, zend_reference *ref) /* {{{ */
{
zval tmp;

ZVAL_REF(&tmp, ref);
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE;
return zend_hash_next_index_insert(arg, &tmp) ? SUCCESS : FAILURE;
}
/* }}} */

Expand Down
46 changes: 24 additions & 22 deletions Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,34 +634,34 @@ static zend_always_inline void add_assoc_zval(zval *arg, const char *key, zval *
add_assoc_zval_ex(arg, key, strlen(key), value);
}

ZEND_API void add_index_long(zval *arg, zend_ulong index, zend_long n);
ZEND_API void add_index_null(zval *arg, zend_ulong index);
ZEND_API void add_index_bool(zval *arg, zend_ulong index, bool b);
ZEND_API void add_index_resource(zval *arg, zend_ulong index, zend_resource *r);
ZEND_API void add_index_double(zval *arg, zend_ulong index, double d);
ZEND_API void add_index_str(zval *arg, zend_ulong index, zend_string *str);
ZEND_API void add_index_string(zval *arg, zend_ulong index, const char *str);
ZEND_API void add_index_stringl(zval *arg, zend_ulong index, const char *str, size_t length);
ZEND_API void add_index_array(zval *arg, zend_ulong index, zend_array *arr);
ZEND_API void add_index_object(zval *arg, zend_ulong index, zend_object *obj);
ZEND_API void add_index_reference(zval *arg, zend_ulong index, zend_reference *ref);
ZEND_API void add_index_long_ex(HashTable *arg, zend_ulong index, zend_long n);
ZEND_API void add_index_null_ex(HashTable *arg, zend_ulong index);
ZEND_API void add_index_bool_ex(HashTable *arg, zend_ulong index, bool b);
ZEND_API void add_index_resource_ex(HashTable *arg, zend_ulong index, zend_resource *r);
ZEND_API void add_index_double_ex(HashTable *arg, zend_ulong index, double d);
ZEND_API void add_index_str_ex(HashTable *arg, zend_ulong index, zend_string *str);
ZEND_API void add_index_string_ex(HashTable *arg, zend_ulong index, const char *str);
ZEND_API void add_index_stringl_ex(HashTable *arg, zend_ulong index, const char *str, size_t length);
ZEND_API void add_index_array_ex(HashTable *arg, zend_ulong index, zend_array *arr);
ZEND_API void add_index_object_ex(HashTable *arg, zend_ulong index, zend_object *obj);
ZEND_API void add_index_reference_ex(HashTable *arg, zend_ulong index, zend_reference *ref);

static zend_always_inline zend_result add_index_zval(zval *arg, zend_ulong index, zval *value)
{
return zend_hash_index_update(Z_ARRVAL_P(arg), index, value) ? SUCCESS : FAILURE;
}

ZEND_API zend_result add_next_index_long(zval *arg, zend_long n);
ZEND_API zend_result add_next_index_null(zval *arg);
ZEND_API zend_result add_next_index_bool(zval *arg, bool b);
ZEND_API zend_result add_next_index_resource(zval *arg, zend_resource *r);
ZEND_API zend_result add_next_index_double(zval *arg, double d);
ZEND_API zend_result add_next_index_str(zval *arg, zend_string *str);
ZEND_API zend_result add_next_index_string(zval *arg, const char *str);
ZEND_API zend_result add_next_index_stringl(zval *arg, const char *str, size_t length);
ZEND_API zend_result add_next_index_array(zval *arg, zend_array *arr);
ZEND_API zend_result add_next_index_object(zval *arg, zend_object *obj);
ZEND_API zend_result add_next_index_reference(zval *arg, zend_reference *ref);
ZEND_API zend_result add_next_index_long_ex(HashTable *arg, zend_long n);
ZEND_API zend_result add_next_index_null_ex(HashTable *arg);
ZEND_API zend_result add_next_index_bool_ex(HashTable *arg, bool b);
ZEND_API zend_result add_next_index_resource_ex(HashTable *arg, zend_resource *r);
ZEND_API zend_result add_next_index_double_ex(HashTable *arg, double d);
ZEND_API zend_result add_next_index_str_ex(HashTable *arg, zend_string *str);
ZEND_API zend_result add_next_index_string_ex(HashTable *arg, const char *str);
ZEND_API zend_result add_next_index_stringl_ex(HashTable *arg, const char *str, size_t length);
ZEND_API zend_result add_next_index_array_ex(HashTable *arg, zend_array *arr);
ZEND_API zend_result add_next_index_object_ex(HashTable *arg, zend_object *obj);
ZEND_API zend_result add_next_index_reference_ex(HashTable *arg, zend_reference *ref);

static zend_always_inline zend_result add_next_index_zval(zval *arg, zval *value)
{
Expand Down Expand Up @@ -2696,4 +2696,6 @@ static zend_always_inline bool zend_parse_arg_obj_or_str(

END_EXTERN_C()

#include "zend_API_generic.h"

#endif /* ZEND_API_H */
Loading
Loading