helly Sat Jan 3 14:20:22 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c
Log:
- MFH Improved closure support
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.46&r2=1.164.2.33.2.45.2.47&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.46
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.47
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.46 Sat Jan
3 12:39:27 2009
+++ php-src/ext/reflection/php_reflection.c Sat Jan 3 14:20:22 2009
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.46 2009/01/03 12:39:27 helly Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.47 2009/01/03 14:20:22 helly Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -223,6 +223,18 @@
INIT_PZVAL(return_value);
}
+static void _default_lookup_entry(zval *object, char *name, int name_len, zval
**return_value TSRMLS_DC) /* {{{ */
+{
+ zval **value;
+
+ if (zend_hash_find(Z_OBJPROP_P(object), name, name_len, (void **)
&value) == FAILURE) {
+ *return_value = NULL;
+ } else {
+ *return_value = *value;
+ }
+}
+/* }}} */
+
static void reflection_register_implement(zend_class_entry *class_entry,
zend_class_entry *interface_entry TSRMLS_DC)
{
zend_uint num_interfaces = ++class_entry->num_interfaces;
@@ -319,7 +331,7 @@
}
static void _const_string(string *str, char *name, zval *value, char *indent
TSRMLS_DC);
-static void _function_string(string *str, zend_function *fptr,
zend_class_entry *scope, zval* closure, char *indent TSRMLS_DC);
+static void _function_string(string *str, zend_function *fptr,
zend_class_entry *scope, zval* prop_name, zval* closure, char *indent
TSRMLS_DC);
static void _property_string(string *str, zend_property_info *prop, char
*prop_name, char* indent TSRMLS_DC);
static void _class_string(string *str, zend_class_entry *ce, zval *obj, char
*indent TSRMLS_DC);
static void _extension_string(string *str, zend_module_entry *module, char
*indent TSRMLS_DC);
@@ -485,7 +497,7 @@
&& ((mptr->common.fn_flags &
ZEND_ACC_PRIVATE) == 0 || mptr->common.scope == ce))
{
string_printf(str, "\n");
- _function_string(str, mptr, ce, NULL,
sub_indent.string TSRMLS_CC);
+ _function_string(str, mptr, ce, NULL,
NULL, sub_indent.string TSRMLS_CC);
}
zend_hash_move_forward_ex(&ce->function_table,
&pos);
}
@@ -587,7 +599,7 @@
closure = NULL;
}
string_printf(&dyn, "\n");
- _function_string(&dyn, mptr,
ce, NULL, sub_indent.string TSRMLS_CC);
+ _function_string(&dyn, mptr,
ce, NULL, NULL, sub_indent.string TSRMLS_CC);
count++;
_free_function(closure
TSRMLS_CC);
}
@@ -744,7 +756,7 @@
/* }}} */
/* {{{ _function_string */
-static void _function_string(string *str, zend_function *fptr,
zend_class_entry *scope, zval* closure, char* indent TSRMLS_DC)
+static void _function_string(string *str, zend_function *fptr,
zend_class_entry *scope, zval* prop_name, zval* closure, char* indent TSRMLS_DC)
{
string param_indent;
zend_function *overwrites;
@@ -828,7 +840,7 @@
if (fptr->op_array.return_reference) {
string_printf(str, "&");
}
- string_printf(str, "%s ] {\n", fptr->common.function_name);
+ string_printf(str, "%s ] {\n", closure && prop_name ?
Z_STRVAL_P(prop_name) : fptr->common.function_name);
/* The information where a function is declared is only available for
user classes */
if (fptr->type == ZEND_USER_FUNCTION) {
string_printf(str, "%s @@ %s %d - %d\n", indent,
@@ -1060,7 +1072,7 @@
continue;
}
- _function_string(str, fptr, NULL, NULL, " "
TSRMLS_CC);
+ _function_string(str, fptr, NULL, NULL, NULL, " "
TSRMLS_CC);
func++;
}
string_printf(str, "%s }\n", indent);
@@ -1473,7 +1485,7 @@
}
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "O", &closure, zend_ce_closure) == SUCCESS) {
- fptr = zend_get_closure_invoke_method(closure TSRMLS_CC);
+ fptr = (zend_function*)zend_get_closure_method_def(closure
TSRMLS_CC);
Z_ADDREF_P(closure);
} else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&name_str, &name_len) == SUCCESS) {
lcname = zend_str_tolower_dup(name_str, name_len);
@@ -1505,11 +1517,13 @@
reflection_object *intern;
zend_function *fptr;
string str;
+ zval* name;
METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
GET_REFLECTION_OBJECT_PTR(fptr);
+ _default_lookup_entry(getThis(), "name", sizeof("name"), &name
TSRMLS_CC);
string_init(&str);
- _function_string(&str, fptr, intern->ce, intern->obj, "" TSRMLS_CC);
+ _function_string(&str, fptr, intern->ce, name, intern->obj, ""
TSRMLS_CC);
RETURN_STRINGL(str.string, str.len - 1, 0);
}
/* }}} */
@@ -2418,15 +2432,45 @@
{
/* do nothing, mptr already set */
} else if (zend_hash_find(&ce->function_table, lcname, name_len + 1,
(void **) &mptr) == FAILURE) {
- efree(lcname);
- zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
- "Method %s::%s() does not exist", ce->name, name_str);
- return;
+ /* Check if this is a property storing a closure */
+ mptr = NULL; /* Set by closure detection again */
+ if (orig_obj) {
+ zval **callable, member;
+ zend_property_info *property_info;
+ zend_object *zobj = zend_objects_get_address(orig_obj
TSRMLS_CC);
+
+ ZVAL_STRINGL(&member, name_str, name_len, 0);
+ property_info = zend_get_property_info(ce, &member, 1
TSRMLS_CC);
+
+ if (property_info &&
zend_hash_quick_find(zobj->properties, property_info->name,
property_info->name_length+1, property_info->h, (void **) &callable) ==
SUCCESS) {
+ zval *callable_obj;
+ zend_class_entry *ce_ptr;
+ zend_function *fbc;
+
+ if (Z_TYPE_PP(callable) == IS_OBJECT
+ && Z_OBJ_HANDLER_PP(callable, get_closure)
+ && Z_OBJ_HANDLER_PP(callable,
get_closure)(*callable, &ce_ptr, &fbc, &callable_obj TSRMLS_CC) == SUCCESS) {
+ mptr = fbc;
+ Z_ADDREF_PP(callable);
+ intern->obj = *callable;
+ }
+ }
+ }
+ if (!mptr) {
+ efree(lcname);
+ zend_throw_exception_ex(reflection_exception_ptr, 0
TSRMLS_CC,
+ "Method %s::%s() does not exist", ce->name,
name_str);
+ return;
+ }
}
efree(lcname);
MAKE_STD_ZVAL(name);
- ZVAL_STRING(name, mptr->common.function_name, 1);
+ if (intern->obj) {
+ ZVAL_STRINGL(name, name_str, name_len, 1);
+ } else {
+ ZVAL_STRING(name, mptr->common.function_name, 1);
+ }
zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **)
&name, sizeof(zval *), NULL);
intern->ptr = mptr;
intern->ref_type = REF_TYPE_FUNCTION;
@@ -2441,11 +2485,13 @@
reflection_object *intern;
zend_function *mptr;
string str;
+ zval *name;
METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0);
GET_REFLECTION_OBJECT_PTR(mptr);
+ _default_lookup_entry(getThis(), "name", sizeof("name"), &name
TSRMLS_CC);
string_init(&str);
- _function_string(&str, mptr, intern->ce, intern->obj, "" TSRMLS_CC);
+ _function_string(&str, mptr, intern->ce, name, intern->obj, ""
TSRMLS_CC);
RETURN_STRINGL(str.string, str.len - 1, 0);
}
/* }}} */
@@ -5306,7 +5352,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Revision: 1.164.2.33.2.45.2.46
$");
+ php_info_print_table_row(2, "Version", "$Revision: 1.164.2.33.2.45.2.47
$");
php_info_print_table_end();
} /* }}} */
@@ -5320,7 +5366,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- "$Revision: 1.164.2.33.2.45.2.46 $",
+ "$Revision: 1.164.2.33.2.45.2.47 $",
STANDARD_MODULE_PROPERTIES
}; /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
