helly Wed Nov 26 03:18:27 2003 EDT
Modified files:
/spl php_spl.c spl_array.c spl_array.h
Log:
Remove interfaces implemented in engine now
Index: spl/php_spl.c
diff -u spl/php_spl.c:1.18 spl/php_spl.c:1.19
--- spl/php_spl.c:1.18 Mon Nov 17 00:32:42 2003
+++ spl/php_spl.c Wed Nov 26 03:18:26 2003
@@ -210,10 +210,8 @@
{
array_init(return_value);
- SPL_ADD_CLASS(ArrayAccess);
SPL_ADD_CLASS(ArrayObject);
SPL_ADD_CLASS(ArrayIterator);
- SPL_ADD_CLASS(ArrayRead);
SPL_ADD_CLASS(DirectoryIterator);
SPL_ADD_CLASS(RecursiveIterator);
SPL_ADD_CLASS(RecursiveIteratorIterator);
Index: spl/spl_array.c
diff -u spl/spl_array.c:1.25 spl/spl_array.c:1.26
--- spl/spl_array.c:1.25 Sat Nov 22 15:44:44 2003
+++ spl/spl_array.c Wed Nov 26 03:18:26 2003
@@ -31,29 +31,6 @@
#include "spl_array.h"
-static
-ZEND_BEGIN_ARG_INFO(arginfo_one_param, 0)
- ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO();
-
-static
-ZEND_BEGIN_ARG_INFO(arginfo_two_params, 0)
- ZEND_ARG_INFO(0, index)
- ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO();
-
-function_entry spl_funcs_ArrayRead[] = {
- SPL_ABSTRACT_ME(ArrayRead, get, arginfo_one_param)
- SPL_ABSTRACT_ME(ArrayRead, exists, arginfo_one_param)
- {NULL, NULL, NULL}
-};
-
-function_entry spl_funcs_ArrayAccess[] = {
- SPL_ABSTRACT_ME(ArrayAccess, set, arginfo_two_params)
- SPL_ABSTRACT_ME(ArrayAccess, del, arginfo_one_param)
- {NULL, NULL, NULL}
-};
-
SPL_METHOD(Array, __construct);
SPL_METHOD(Array, getIterator);
SPL_METHOD(Array, rewind);
@@ -83,8 +60,6 @@
{NULL, NULL, NULL}
};
-zend_class_entry * spl_ce_ArrayRead;
-zend_class_entry * spl_ce_ArrayAccess;
zend_object_handlers spl_handler_ArrayObject;
zend_class_entry * spl_ce_ArrayObject;
@@ -310,13 +285,6 @@
/* {{{ PHP_MINIT_FUNCTION(spl_array) */
PHP_MINIT_FUNCTION(spl_array)
{
-#if MBO_0
- REGISTER_SPL_INTERFACE(ArrayRead);
-
- REGISTER_SPL_INTERFACE(ArrayAccess);
- zend_class_implements(spl_ce_ArrayAccess TSRMLS_CC, 1, spl_ce_ArrayRead);
-#endif
-
REGISTER_SPL_STD_CLASS_EX(ArrayObject, spl_array_object_new,
spl_funcs_ArrayObject);
zend_class_implements(spl_ce_ArrayObject TSRMLS_CC, 1, zend_ce_aggregate);
memcpy(&spl_handler_ArrayObject, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
Index: spl/spl_array.h
diff -u spl/spl_array.h:1.6 spl/spl_array.h:1.7
--- spl/spl_array.h:1.6 Mon Nov 17 00:32:43 2003
+++ spl/spl_array.h Wed Nov 26 03:18:26 2003
@@ -22,8 +22,6 @@
#include "php.h"
#include "php_spl.h"
-extern zend_class_entry *spl_ce_ArrayRead;
-extern zend_class_entry *spl_ce_ArrayAccess;
extern zend_class_entry *spl_ce_ArrayObject;
extern zend_class_entry *spl_ce_ArrayIterator;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
