helly Sun Jan 25 12:30:20 2004 EDT
Modified files:
/php-src/ext/spl php_spl.c spl_functions.c spl_functions.h
Log:
Show supported classes & interfaces in -i and phpinfo()
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.26&r2=1.27&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.26 php-src/ext/spl/php_spl.c:1.27
--- php-src/ext/spl/php_spl.c:1.26 Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/php_spl.c Sun Jan 25 12:30:19 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.26 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: php_spl.c,v 1.27 2004/01/25 17:30:19 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,16 +120,6 @@
}
/* }}} */
-/* {{{ PHP_MINFO(spl)
- */
-PHP_MINFO_FUNCTION(spl)
-{
- php_info_print_table_start();
- php_info_print_table_header(2, "SPL support", "enabled");
- php_info_print_table_end();
-}
-/* }}} */
-
/* {{{ class_parents
*/
PHP_FUNCTION(class_parents)
@@ -143,7 +133,7 @@
array_init(return_value);
parent_class = Z_OBJCE_P(obj)->parent;
while (parent_class) {
- spl_add_class_name(return_value, parent_class TSRMLS_CC);
+ spl_add_class_name(return_value, parent_class, 0, 0 TSRMLS_CC);
parent_class = parent_class->parent;
}
}
@@ -159,33 +149,76 @@
RETURN_FALSE;
}
array_init(return_value);
- spl_add_interfaces(return_value, Z_OBJCE_P(obj) TSRMLS_CC);
+ spl_add_interfaces(return_value, Z_OBJCE_P(obj), 1, ZEND_ACC_INTERFACE
TSRMLS_CC);
}
/* }}} */
-#define SPL_ADD_CLASS(class_name) \
- spl_add_classes(&spl_ce_ ## class_name, return_value TSRMLS_CC)
+#define SPL_ADD_CLASS(class_name, z_list, sub, allow, ce_flags) \
+ spl_add_classes(&spl_ce_ ## class_name, z_list, sub, allow, ce_flags TSRMLS_CC)
+
+#define SPL_LIST_CLASSES(z_list, sub, allow, ce_flags) \
+ SPL_ADD_CLASS(ArrayObject, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(ArrayIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(CachingRecursiveIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(FilterIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(LimitIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(ParentIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveDirectoryIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \
/* {{{ spl_classes */
PHP_FUNCTION(spl_classes)
{
array_init(return_value);
+
+ SPL_LIST_CLASSES(return_value, 0, 0, 0)
+}
+/* }}} */
- SPL_ADD_CLASS(ArrayObject);
- SPL_ADD_CLASS(ArrayIterator);
- SPL_ADD_CLASS(CachingIterator);
- SPL_ADD_CLASS(CachingRecursiveIterator);
- SPL_ADD_CLASS(DirectoryIterator);
- SPL_ADD_CLASS(FilterIterator);
- SPL_ADD_CLASS(LimitIterator);
- SPL_ADD_CLASS(ParentIterator);
- SPL_ADD_CLASS(RecursiveDirectoryIterator);
- SPL_ADD_CLASS(RecursiveIterator);
- SPL_ADD_CLASS(RecursiveIteratorIterator);
- SPL_ADD_CLASS(SeekableIterator);
- if (spl_ce_SimpleXMLIterator) {
- SPL_ADD_CLASS(SimpleXMLIterator);
- }
+int spl_build_class_list_string(zval **entry, char **list TSRMLS_DC)
+{
+ char *res;
+
+ spprintf(&res, 0, "%s, %s", *list, Z_STRVAL_PP(entry));
+ efree(*list);
+ *list = res;
+ return ZEND_HASH_APPLY_KEEP;
+}
+
+/* {{{ PHP_MINFO(spl)
+ */
+PHP_MINFO_FUNCTION(spl)
+{
+ zval list;
+ char *strg;
+
+ php_info_print_table_start();
+ php_info_print_table_header(2, "SPL support", "enabled");
+
+ INIT_PZVAL(&list);
+ array_init(&list);
+ SPL_LIST_CLASSES(&list, 0, 1, ZEND_ACC_INTERFACE)
+ strg = estrdup("");
+ zend_hash_apply_with_argument(Z_ARRVAL_P(&list),
(apply_func_arg_t)spl_build_class_list_string, &strg TSRMLS_CC);
+ zval_dtor(&list);
+ php_info_print_table_row(2, "Interfaces", strg + 2);
+ efree(strg);
+
+ INIT_PZVAL(&list);
+ array_init(&list);
+ SPL_LIST_CLASSES(&list, 0, -1, ZEND_ACC_INTERFACE)
+ strg = estrdup("");
+ zend_hash_apply_with_argument(Z_ARRVAL_P(&list),
(apply_func_arg_t)spl_build_class_list_string, &strg TSRMLS_CC);
+ zval_dtor(&list);
+ php_info_print_table_row(2, "Classes", strg + 2);
+ efree(strg);
+
+ php_info_print_table_end();
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.c?r1=1.20&r2=1.21&ty=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.20 php-src/ext/spl/spl_functions.c:1.21
--- php-src/ext/spl/spl_functions.c:1.20 Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_functions.c Sun Jan 25 12:30:19 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.c,v 1.20 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_functions.c,v 1.21 2004/01/25 17:30:19 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -104,39 +104,46 @@
/* }}} */
/* {{{ spl_add_class_name */
-void spl_add_class_name(zval * list, zend_class_entry * pce TSRMLS_DC)
+void spl_add_class_name(zval *list, zend_class_entry * pce, int allow, int ce_flags
TSRMLS_DC)
{
size_t len = strlen(pce->name);
zval *tmp;
- if (zend_hash_find(Z_ARRVAL_P(list), pce->name, len+1, (void*)&tmp) ==
FAILURE) {
- MAKE_STD_ZVAL(tmp);
- ZVAL_STRING(tmp, pce->name, 1);
- zend_hash_add(Z_ARRVAL_P(list), pce->name, len+1, &tmp, sizeof(zval
*), NULL);
+ if (!allow || (allow > 0 && pce->ce_flags & ce_flags) || (allow < 0 &&
!(pce->ce_flags & ce_flags))) {
+ if (zend_hash_find(Z_ARRVAL_P(list), pce->name, len+1, (void*)&tmp) ==
FAILURE) {
+ MAKE_STD_ZVAL(tmp);
+ ZVAL_STRING(tmp, pce->name, 1);
+ zend_hash_add(Z_ARRVAL_P(list), pce->name, len+1, &tmp,
sizeof(zval *), NULL);
+ }
}
}
/* }}} */
/* {{{ spl_add_interfaces */
-void spl_add_interfaces(zval *list, zend_class_entry * pce TSRMLS_DC)
+void spl_add_interfaces(zval *list, zend_class_entry * pce, int allow, int ce_flags
TSRMLS_DC)
{
zend_uint num_interfaces;
for (num_interfaces = 0; num_interfaces < pce->num_interfaces;
num_interfaces++) {
- spl_add_class_name(list, pce->interfaces[num_interfaces] TSRMLS_CC);
+ spl_add_class_name(list, pce->interfaces[num_interfaces], allow,
ce_flags TSRMLS_CC);
}
}
/* }}} */
/* {{{ spl_add_classes */
-int spl_add_classes(zend_class_entry ** ppce, zval *list TSRMLS_DC)
+int spl_add_classes(zend_class_entry ** ppce, zval *list, int sub, int allow, int
ce_flags TSRMLS_DC)
{
+ if (!ppce) {
+ return 0;
+ }
zend_class_entry *pce = *ppce;
- spl_add_class_name(list, pce TSRMLS_CC);
- spl_add_interfaces(list, pce TSRMLS_CC);
- while (pce->parent) {
- pce = pce->parent;
- spl_add_classes(&pce, list TSRMLS_CC);
+ spl_add_class_name(list, pce, allow, ce_flags TSRMLS_CC);
+ if (sub) {
+ spl_add_interfaces(list, pce, allow, ce_flags TSRMLS_CC);
+ while (pce->parent) {
+ pce = pce->parent;
+ spl_add_classes(&pce, list, sub, allow, ce_flags TSRMLS_CC);
+ }
}
return 0;
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.h?r1=1.15&r2=1.16&ty=u
Index: php-src/ext/spl/spl_functions.h
diff -u php-src/ext/spl/spl_functions.h:1.15 php-src/ext/spl/spl_functions.h:1.16
--- php-src/ext/spl/spl_functions.h:1.15 Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_functions.h Sun Jan 25 12:30:19 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.h,v 1.15 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_functions.h,v 1.16 2004/01/25 17:30:19 helly Exp $ */
#ifndef PHP_FUNCTIONS_H
#define PHP_FUNCTIONS_H
@@ -63,9 +63,14 @@
void spl_register_functions(zend_class_entry * class_entry, function_entry *
function_list TSRMLS_DC);
void spl_register_property( zend_class_entry * class_entry, char *prop_name, zval
*prop_val, int prop_flags TSRMLS_DC);
-void spl_add_class_name(zval * list, zend_class_entry * pce TSRMLS_DC);
-void spl_add_interfaces(zval * list, zend_class_entry * pce TSRMLS_DC);
-int spl_add_classes(zend_class_entry ** ppce, zval *list TSRMLS_DC);
+/* sub: whether to allow subclasses/interfaces
+ allow = 0: allow all classes and interfaces
+ allow > 0: allow all that match and mask ce_flags
+ allow < 0: disallow all that match and mask ce_flags
+ */
+void spl_add_class_name(zval * list, zend_class_entry * pce, int allow, int ce_flags
TSRMLS_DC);
+void spl_add_interfaces(zval * list, zend_class_entry * pce, int allow, int ce_flags
TSRMLS_DC);
+int spl_add_classes(zend_class_entry ** ppce, zval *list, int sub, int allow, int
ce_flags TSRMLS_DC);
#define SPL_ME(class_name, function_name, arg_info, flags) \
PHP_ME( spl_ ## class_name, function_name, arg_info, flags)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
