cvs: php-src /ext/spl spl_array.c

From: Date: Sun, 25 Apr 2004 13:04:36 +0000
Subject: cvs: php-src /ext/spl spl_array.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-27181@lists.php.net to get a copy of this message
helly Sun Apr 25 09:04:36 2004 EDT Modified files: /php-src/ext/spl spl_array.c Log: With the new inheritance rules we need an explicit append method. http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.39&r2=1.40&ty=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.39 php-src/ext/spl/spl_array.c:1.40 --- php-src/ext/spl/spl_array.c:1.39 Sun Apr 25 07:14:11 2004 +++ php-src/ext/spl/spl_array.c Sun Apr 25 09:04:36 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.39 2004/04/25 11:14:11 helly Exp $ */ +/* $Id: spl_array.c,v 1.40 2004/04/25 13:04:36 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -43,6 +43,7 @@ SPL_METHOD(Array, offsetGet); SPL_METHOD(Array, offsetSet); SPL_METHOD(Array, offsetUnset); +SPL_METHOD(Array, append); SPL_METHOD(Array, getArrayCopy); static @@ -61,6 +62,11 @@ ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO(); +static +ZEND_BEGIN_ARG_INFO(arginfo_array_append, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); + static zend_function_entry spl_funcs_ArrayObject[] = { SPL_ME(Array, __construct, arginfo_array___construct, ZEND_ACC_PUBLIC) SPL_ME(Array, getIterator, NULL, ZEND_ACC_PUBLIC) @@ -68,6 +74,7 @@ SPL_ME(Array, offsetGet, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetSet, arginfo_array_offsetSet, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetUnset, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) + SPL_ME(Array, append, arginfo_array_append, ZEND_ACC_PUBLIC) SPL_ME(Array, getArrayCopy, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; @@ -83,6 +90,7 @@ SPL_ME(Array, offsetGet, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetSet, arginfo_array_offsetSet, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetUnset, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) + SPL_ME(Array, append, arginfo_array_append, ZEND_ACC_PUBLIC) SPL_ME(Array, getArrayCopy, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; @@ -334,13 +342,24 @@ Sets the value at the specified $index to $newval. */ SPL_METHOD(Array, offsetSet) { - zval *index, *value; + zval *index, *value = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &index, &value) == FAILURE) { return; } spl_array_write_dimension(getThis(), index, value TSRMLS_CC); } /* }}} */ +/* {{{ proto bool ArrayObject::append(mixed $newval) + Appends the value. */ +SPL_METHOD(Array, append) +{ + zval *value; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &value) == FAILURE) { + return; + } + spl_array_write_dimension(getThis(), NULL, value TSRMLS_CC); +} /* }}} */ + /* {{{ proto bool ArrayObject::offsetUnset(mixed $index) Unsets the value at the specified $index. */ SPL_METHOD(Array, offsetUnset)

« previous php.cvs (#27181) next »