#ifdef HAVE_CONFIG_H
# include "config.h"
+#else
+# include "php_config.h"
#endif
#include "php.h"
#include "php_psi.h"
#include "zend_exceptions.h"
+#include "zend_interfaces.h"
+#include "ext/spl/spl_iterators.h"
+#include "parser.h"
#include "engine.h"
#include "calc.h"
#include "marshal.h"
-size_t psi_t_alignment(token_t t)
+static inline void psi_do_set(zval *return_value, set_value *set)
{
-#define PSI_ALIGNOF(T) case PSI_T_## T: return ALIGNOF_## T ##_T;
- switch (t) {
- PSI_ALIGNOF(INT8);
- PSI_ALIGNOF(UINT8);
- PSI_ALIGNOF(INT16);
- PSI_ALIGNOF(UINT16);
- PSI_ALIGNOF(INT32);
- PSI_ALIGNOF(UINT32);
- PSI_ALIGNOF(INT64);
- PSI_ALIGNOF(UINT64);
- case PSI_T_FLOAT:
- return ALIGNOF_FLOAT;
- case PSI_T_DOUBLE:
- return ALIGNOF_DOUBLE;
- case PSI_T_POINTER:
- case PSI_T_FUNCTION:
- return ALIGNOF_VOID_P;
- case PSI_T_ENUM:
- return ALIGNOF_INT;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
- return 0;
-}
+ decl_arg *set_arg = set->vars->vars[0]->arg;
-size_t psi_t_size(token_t t)
-{
-#define PSI_SIZEOF(T) case PSI_T_## T : return SIZEOF_## T ##_T;
- switch (t) {
- PSI_SIZEOF(INT8);
- PSI_SIZEOF(UINT8);
- PSI_SIZEOF(INT16);
- PSI_SIZEOF(UINT16);
- PSI_SIZEOF(INT32);
- PSI_SIZEOF(UINT32);
- PSI_SIZEOF(INT64);
- PSI_SIZEOF(UINT64);
- case PSI_T_FLOAT:
- return SIZEOF_FLOAT;
- case PSI_T_DOUBLE:
- return SIZEOF_DOUBLE;
- case PSI_T_POINTER:
- case PSI_T_FUNCTION:
- return SIZEOF_VOID_P;
- case PSI_T_ENUM:
- return SIZEOF_INT;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
- return 0;
+ zval_dtor(return_value);
+ set->func->handler(return_value, set, set_arg->let);
}
int psi_internal_type(impl_type *type)
}
}
+zend_long psi_zval_count(zval *zvalue)
+{
+ /* mimic PHP count() */
+ zend_long count;
+ zval retval;
+
+ switch (Z_TYPE_P(zvalue)) {
+ default:
+ count = 1;
+ break;
+ case IS_NULL:
+ count = 0;
+ break;
+ case IS_ARRAY:
+ count = zend_array_count(Z_ARRVAL_P(zvalue));
+ break;
+ case IS_OBJECT:
+ count = 1;
+ if (Z_OBJ_HT_P(zvalue)->count_elements) {
+ if (SUCCESS == Z_OBJ_HT_P(zvalue)->count_elements(zvalue, &count)) {
+ break;
+ }
+ }
+
+ if (instanceof_function(Z_OBJCE_P(zvalue), spl_ce_Countable)) {
+ zend_call_method_with_0_params(zvalue, NULL, NULL, "count", &retval);
+ if (Z_TYPE(retval) != IS_UNDEF) {
+ count = zval_get_long(&retval);
+ zval_ptr_dtor(&retval);
+ }
+ }
+ break;
+ }
+
+ return count;
+}
+
zend_internal_arg_info *psi_internal_arginfo(impl *impl)
{
size_t i;
} else if (PSI_T_MIXED == iarg->type->type) {
Z_PARAM_PROLOGUE(0);
} else if (PSI_T_CALLABLE == iarg->type->type) {
- Z_PARAM_FUNC_EX(iarg->val.zend.cb.fci, iarg->val.zend.cb.fcc, 1, 0);
+ zend_fcall_info fci;
+ zend_fcall_info_cache fcc;
+
+ Z_PARAM_FUNC_EX(fci, fcc, 1, 0);
+
+ if (fci.size) {
+ iarg->val.zend.cb = ecalloc(1, sizeof(zend_fcall));
+ iarg->val.zend.cb->fci = fci;
+ iarg->val.zend.cb->fcc = fcc;
+ }
} else {
error_code = ZPP_ERROR_FAILURE;
break;
return mem;
}
-static inline impl_val *psi_let_val(token_t let_func, impl_arg *iarg, impl_val *arg_val, decl_struct *strct, void **to_free)
+static inline impl_val *psi_let_func(let_func *func, decl_arg *darg);
+
+static inline void *psi_let_val(let_val *val, decl_arg *darg)
{
- switch (let_func) {
- case PSI_T_BOOLVAL:
- if (iarg->type->type == PSI_T_BOOL) {
- arg_val->cval = iarg->val.zend.bval;
- } else {
- arg_val->cval = zend_is_true(iarg->_zv);
- }
+ ZEND_ASSERT(darg);
+
+ switch (val ? val->kind : PSI_LET_NULL) {
+ case PSI_LET_TMP:
+ memcpy(darg->ptr, deref_impl_val(val->data.var->arg->let, val->data.var), sizeof(impl_val));
break;
- case PSI_T_INTVAL:
- if (iarg->type->type == PSI_T_INT) {
- arg_val->lval = iarg->val.zend.lval;
+ case PSI_LET_NULL:
+ if (darg->var->array_size) {
+ darg->val.ptr = ecalloc(darg->var->array_size, sizeof(impl_val));
+ darg->mem = darg->val.ptr;
} else {
- arg_val->lval = zval_get_long(iarg->_zv);
+ memset(&darg->val, 0, sizeof(impl_val));
}
break;
- case PSI_T_FLOATVAL:
- if (iarg->type->type == PSI_T_FLOAT || iarg->type->type == PSI_T_DOUBLE) {
- arg_val->dval = iarg->val.dval;
- } else {
- arg_val->dval = zval_get_double(iarg->_zv);
- }
+ case PSI_LET_CALLOC:
+ darg->val.ptr = psi_do_calloc(val->data.alloc);
+ darg->mem = darg->val.ptr;
break;
- case PSI_T_PATHVAL:
- case PSI_T_STRVAL:
- if (iarg->type->type == PSI_T_STRING) {
- if (iarg->val.zend.str) {
- arg_val->ptr = estrndup(iarg->val.zend.str->val, iarg->val.zend.str->len);
- *to_free = arg_val->ptr;
- } else {
- arg_val->ptr = "";
- }
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->ptr = estrdup(zs->val);
- *to_free = arg_val->ptr;
- zend_string_release(zs);
- }
- if (PSI_T_PATHVAL == let_func) {
- if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
- efree(arg_val->ptr);
- return NULL;
- }
- }
+ case PSI_LET_NUMEXP:
+ darg->val.zend.lval = psi_long_num_exp(val->data.num, NULL);
break;
- case PSI_T_STRLEN:
- if (iarg->type->type == PSI_T_STRING) {
- if (iarg->val.zend.str) {
- arg_val->lval = iarg->val.zend.str->len;
- } else {
- arg_val->lval = 0;
- }
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->lval = zs->len;
- zend_string_release(zs);
- }
+ case PSI_LET_CALLBACK:
+ darg->val.ptr = val->data.callback->decl->call.sym;
break;
- case PSI_T_ARRVAL:
- if (iarg->type->type == PSI_T_ARRAY) {
- arg_val = psi_array_to_struct(strct, HASH_OF(iarg->_zv));
- *to_free = arg_val;
+ case PSI_LET_FUNC:
+ if (!psi_let_func(val->data.func, darg)) {
+ return NULL;
}
break;
- case PSI_T_OBJVAL:
- if (iarg->type->type == PSI_T_OBJECT) {
- psi_object *obj;
+ }
- if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_object_get_class_entry())) {
- return NULL;
+ if (val && val->is_reference) {
+ return darg->let = &darg->ptr;
+ } else {
+ return darg->let = darg->ptr;
+ }
+}
+
+static inline impl_val *psi_let_func_ex(let_func *func, void *dptr, decl_type *dtype, decl_var *dvar, token_t itype, impl_val *ival, zval *zvalue, void **to_free) {
+ switch (func->type) {
+ case PSI_T_BOOLVAL:
+ return psi_let_boolval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_INTVAL:
+ return psi_let_intval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_FLOATVAL:
+ return psi_let_floatval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_STRVAL:
+ return psi_let_strval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_STRLEN:
+ return psi_let_strlen(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_PATHVAL:
+ return psi_let_pathval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_OBJVAL:
+ return psi_let_objval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_ZVAL:
+ return psi_let_zval(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_VOID:
+ return psi_let_void(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_COUNT:
+ return psi_let_count(dptr, dtype, itype, ival, zvalue, to_free);
+ case PSI_T_ARRVAL:
+ if (func->inner) {
+ char *mem = NULL;
+ size_t i, j = 0;
+ decl_type *real;
+ decl_args *args = extract_decl_type_args(dtype, &real);
+
+ if (itype != PSI_T_ARRAY) {
+ SEPARATE_ARG_IF_REF(zvalue);
+ convert_to_array(zvalue);
}
- obj = PSI_OBJ(iarg->_zv, NULL);
- arg_val->ptr = obj->data;
- }
- break;
- case PSI_T_CBVAL:
- if (iarg->type->type == PSI_T_CALLABLE) {
-
+ if (args) {
+ size_t size = extract_decl_type_size(real, NULL);
+
+ mem = ecalloc(1, size + args->count * sizeof(void *));
+
+ for (i = 0; i < args->count; ++i) {
+ decl_arg *darg = args->args[i];
+ let_val *lval = locate_let_vals_val(func->inner, darg->var->name);
+ impl_val *ptr = NULL;
+
+ if (lval) {
+ if ((ptr = psi_let_val(lval, darg))) {
+ memcpy(mem + darg->layout->pos, ptr, darg->layout->len);
+ if (darg->mem) {
+ ((void **)(mem + size))[j++] = darg->mem;
+ }
+ }
+ if (real->type == PSI_T_UNION) {
+ break;
+ }
+ }
+ }
+ } else {
+ zval *zv;
+ let_val *inner = func->inner->vals[0];
+ decl_var *sub_var;
+ size_t size;
+
+ if (inner->var) {
+ sub_var = inner->var;
+ } else {
+ sub_var = copy_decl_var(dvar);
+ assert(sub_var->pointer_level);
+ --sub_var->pointer_level;
+ }
+
+ size = sub_var->pointer_level ? SIZEOF_VOID_P : extract_decl_type_size(real, NULL);
+ mem = ecalloc(1, size * (1 + zend_array_count(Z_ARRVAL_P(zvalue))));
+
+ ZEND_HASH_FOREACH_VAL_IND(Z_ARRVAL_P(zvalue), zv)
+ {
+ void *tmp = NULL;
+ impl_val val = {0}, *ptr, *sub;
+
+ ptr = psi_let_func_ex(inner->data.func, &val, real, dvar, 0, NULL, zv, &tmp);
+ sub = deref_impl_val(ptr, sub_var);
+
+ memcpy(&mem[size * j++], &sub, size);
+ }
+ ZEND_HASH_FOREACH_END();
+
+ if (sub_var != inner->var) {
+ free_decl_var(sub_var);
+ }
+ }
+ return *to_free = mem;
+ } else {
+ return psi_let_arrval(dptr, dtype, dvar, itype, ival, zvalue, to_free);
}
break;
- EMPTY_SWITCH_DEFAULT_CASE();
+ default:
+ assert(0);
}
- return arg_val;
+ return NULL;
}
-static inline void *psi_do_let(let_stmt *let)
-{
- decl_arg *darg = let->var->arg;
- impl_val *arg_val = darg->ptr;
- impl_arg *iarg;
+static inline impl_val *psi_let_func(let_func *func, decl_arg *darg) {
- switch (let->val ? let->val->kind : PSI_LET_NULL) {
- case PSI_LET_TMP:
- memcpy(arg_val, deref_impl_val(let->val->data.var->arg->let->ptr, let->val->data.var), sizeof(*arg_val));
-#if 0
- fprintf(stderr, "LET TMP: %p -> %p\n",
- let->val->data.var->arg->let->ptr,
- arg_val->ptr);
-#endif
- break;
- case PSI_LET_NULL:
- if (darg->var->array_size) {
- arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
- darg->mem = arg_val->ptr;
+ if (func->var->arg) {
+ return darg->ptr = psi_let_func_ex(func,
+ darg->ptr, darg->type, darg->var,
+ func->var->arg->type->type,
+ &func->var->arg->val,
+ func->var->arg->_zv,
+ &darg->mem);
+ } else {
+ impl_var *ivar = locate_let_val_impl_var(func->outer);
+ zval *entry = zend_symtable_str_find(Z_ARRVAL_P(ivar->arg->_zv), func->var->name+1, strlen(func->var->name)-1);
+ impl_arg *iarg = init_impl_arg(
+ init_impl_type(PSI_T_MIXED, "mixed"),
+ copy_impl_var(func->var), NULL);
+
+ func->var->arg = iarg;
+ if (entry) {
+ iarg->_zv = entry;
} else {
- memset(arg_val, 0, sizeof(*arg_val));
- }
- break;
- case PSI_LET_CALLOC:
- arg_val->ptr = psi_do_calloc(let->val->data.alloc);
- darg->mem = arg_val->ptr;
- break;
- case PSI_LET_NUMEXP:
- arg_val->zend.lval = psi_long_num_exp(let->val->data.num, NULL);
- break;
- case PSI_LET_FUNC:
- iarg = let->val->data.func->arg;
+ zval ztmp;
- if (!(darg->ptr = psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem))) {
- return NULL;
+ ZVAL_NULL(&ztmp);
+ iarg->_zv = zend_symtable_str_update_ind(Z_ARRVAL_P(ivar->arg->_zv), func->var->name+1, strlen(func->var->name)-1, &ztmp);
}
- }
- if (let->val && let->val->flags.one.is_reference) {
- return let->ptr = &darg->ptr;
- } else {
- return let->ptr = darg->ptr;
+ psi_let_func(func, darg);
+ free_impl_arg(iarg);
+ return darg->ptr;
}
+
}
-static inline void psi_do_set(zval *return_value, set_value *set)
+static inline void *psi_do_let(let_stmt *let)
{
- decl_arg *set_arg = set->vars->vars[0]->arg;
-
- zval_dtor(return_value);
- set->func->handler(return_value, set, set_arg->let ? set_arg->let->ptr : set_arg->ptr);
+ return psi_let_val(let->val, let->val->var->arg);
}
static inline void psi_do_return(zval *return_value, return_stmt *ret)
for (j = 0; j < f->vars->count; ++j) {
decl_var *dvar = f->vars->vars[j];
decl_arg *darg = dvar->arg;
- impl_val *fval = darg->let ? darg->let->ptr : darg->ptr;
+ impl_val *fval = darg->let;
f->decl->call.args[j] = deref_impl_val(fval, dvar);
}
/* FIXME: check in validate_* that free functions return scalar */
- PSI_ContextCall(&PSI_G(context), &f->decl->call, NULL);
+ psi_context_call(&PSI_G(context), &f->decl->call, NULL);
}
}
-static inline void psi_clean_array_struct(decl_arg *darg) {
- if (darg->let
- && darg->let->val->kind == PSI_LET_FUNC
- && darg->let->val->data.func->type == PSI_T_ARRVAL) {
+static inline void psi_clean_array_struct(let_val *val, decl_arg *darg) {
+ if (val->kind == PSI_LET_FUNC
+ && val->data.func->type == PSI_T_ARRVAL) {
decl_type *type = real_decl_type(darg->type);
if (type->type == PSI_T_STRUCT) {
- void **ptr = (void **) ((char *) darg->mem + type->strct->size);
+ void **ptr = (void **) ((char *) darg->mem + type->real.strct->size);
while (*ptr) {
efree(*ptr++);
}
+ // args = type->real.strct->args;
+ } else if (type->type == PSI_T_UNION) {
+ void **ptr = (void **) ((char *) darg->mem + type->real.unn->size);
+
+ if (*ptr) {
+ efree(*ptr);
+ }
+ // args = type->real.unn->args;
+ }
+#if 0
+ if (args && val->data.func->inner) {
+ size_t i;
+
+ for (i = 0; i < val->data.func->inner->count; ++i) {
+ let_val *inner = val->data.func->inner->vals[i];
+ decl_var *refvar = locate_let_val_inner_ref(inner)->var;
+ decl_arg *subarg = locate_decl_arg(args, refvar->name);
+
+ if (subarg) {
+ psi_clean_array_struct(val->data.func->inner->vals[i], subarg);
+ if (subarg->mem) {
+ efree(subarg->mem);
+ subarg->mem = NULL;
+ }
+ }
+ }
+ }
+#endif
+ }
+}
+
+static inline void psi_clean_let_val(let_val *val) {
+
+ let_func *func = locate_let_val_func(val);
+
+ if (func && func->inner) {
+ size_t i;
+
+ for (i = 0; i < func->inner->count; ++i) {
+ let_val *inner = func->inner->vals[i];
+ psi_clean_let_val(inner);
+ }
+ }
+ if (val->var) {
+ decl_arg *darg = val->var->arg;
+ if (darg) {
+ if (darg->mem) {
+ psi_clean_array_struct(val, darg);
+ efree(darg->mem);
+ darg->mem = NULL;
+ }
+ darg->ptr = &darg->val;
+ darg->let = darg->ptr;
}
}
}
efree(impl->decl->func->ptr);
impl->decl->func->ptr = &impl->decl->func->val;
}
+
for (i = 0; i < impl->func->args->count; ++i ) {
impl_arg *iarg = impl->func->args->args[i];
zend_string_release(iarg->val.zend.str);
}
break;
+ case PSI_T_CALLABLE:
+ if (iarg->val.zend.cb) {
+ if (iarg->val.zend.cb->fci.size) {
+ zend_fcall_info_args_clear(&iarg->val.zend.cb->fci, 1);
+ }
+ efree(iarg->val.zend.cb);
+ }
+ break;
}
}
- if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
- decl_arg *darg = impl->decl->args->args[i];
-
- if (darg->mem) {
- psi_clean_array_struct(darg);
- efree(darg->mem);
- darg->mem = NULL;
- }
- darg->ptr = &darg->val;
+ for (i = 0; i < impl->stmts->let.count; ++i) {
+ let_stmt *let = impl->stmts->let.list[i];
+ psi_clean_let_val(let->val);
}
if (impl->func->args->vararg.args) {
size_t i;
for (i = 0; i < impl->decl->args->count; ++i) {
- impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
+ impl->decl->call.args[i] = impl->decl->args->args[i]->let;
}
if (!impl->decl->func->var->pointer_level) {
- decl_type *real = real_decl_type(impl->decl->func->type);
+ decl_type *real;
+ decl_args *args = extract_decl_type_args(impl->decl->func->type, &real);
switch (real->type) {
case PSI_T_STRUCT:
- impl->decl->func->ptr = psi_array_to_struct(real->strct, NULL);
+ case PSI_T_UNION:
+ impl->decl->func->ptr = ecalloc(1,
+ extract_decl_type_size(real, NULL) + args->count * sizeof(void*));
+ break;
+ default:
break;
}
}
for (i = 0, j = 0; i < vacount; ++i) {
impl_arg *vaarg = va->args->args[i];
void *to_free = NULL;
- token_t let_fn, vatype = va->name->type->type;
+ token_t vatype = va->name->type->type;
+ psi_marshal_let let_fn;
if (vatype == PSI_T_MIXED) {
switch (Z_TYPE_P(vaarg->_zv)) {
switch (vatype) {
- case PSI_T_BOOL: let_fn = PSI_T_BOOLVAL; break;
- case PSI_T_INT: let_fn = PSI_T_INTVAL; break;
+ case PSI_T_BOOL: let_fn = psi_let_boolval; break;
+ case PSI_T_INT: let_fn = psi_let_intval; break;
case PSI_T_FLOAT:
- case PSI_T_DOUBLE: let_fn = PSI_T_FLOATVAL;break;
- case PSI_T_STRING: let_fn = PSI_T_STRVAL; break;
+ case PSI_T_DOUBLE: let_fn = psi_let_floatval; break;
+ case PSI_T_STRING: let_fn = psi_let_strval; break;
EMPTY_SWITCH_DEFAULT_CASE();
}
va->types[i] = vatype;
+
/* FIXME: varargs with struct-by-value :) */
- if (!psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free)) {
+ //if (!psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free)) {
+ if (!let_fn(&va->values[i], NULL, vaarg->type->type, &vaarg->val, vaarg->_zv, &to_free)) {
return NULL;
}
return va;
}
-void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
+ZEND_RESULT_CODE psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
{
size_t i;
impl_vararg *va = NULL;
memset(impl->decl->func->ptr, 0, sizeof(impl_val));
if (SUCCESS != psi_parse_args(execute_data, impl)) {
- return;
+ return FAILURE;
}
for (i = 0; i < impl->stmts->let.count; ++i) {
if (!psi_do_let(let)) {
psi_do_return(return_value, impl->stmts->ret.list[0]);
psi_do_clean(impl);
- return;
+ return FAILURE;
}
}
}
}
- PSI_ContextCall(&PSI_G(context), &impl->decl->call, va);
+ psi_context_call(&PSI_G(context), &impl->decl->call, va);
psi_do_return(return_value, impl->stmts->ret.list[0]);
for (i = 0; i < impl->stmts->set.count; ++i) {
psi_do_free(fre);
}
psi_do_clean(impl);
+
+ return SUCCESS;
+}
+
+ZEND_RESULT_CODE psi_callback(let_callback *cb, void *retval, unsigned argc, void **argv)
+{
+ size_t i;
+ decl *decl_cb = cb->decl;
+ impl_arg *iarg = cb->func->var->arg;
+ zval return_value, *zargv = calloc(argc, sizeof(*zargv));
+ void *result, *to_free = NULL;
+
+ ZEND_ASSERT(argc == cb->decl->args->count);
+
+ /* prepare args for the userland call */
+ for (i = 0; i < argc; ++i) {
+ cb->decl->args->args[i]->let = argv[i];
+ }
+ for (i = 0; i < cb->args->count; ++i) {
+ psi_do_set(&zargv[i], cb->args->vals[i]);
+ }
+ zend_fcall_info_argp(&iarg->val.zend.cb->fci, cb->args->count, zargv);
+
+ /* callback into userland */
+ ZVAL_UNDEF(&return_value);
+ iarg->_zv = &return_value;
+ zend_fcall_info_call(&iarg->val.zend.cb->fci, &iarg->val.zend.cb->fcc, iarg->_zv, NULL);
+
+ /* marshal return value of the userland call
+ switch (iarg->type->type) {
+ case PSI_T_BOOL: zend_parse_arg_bool(iarg->_zv, &iarg->val.zend.bval, NULL, 0); break;
+ case PSI_T_LONG: zend_parse_arg_long(iarg->_zv, &iarg->val.zend.lval, NULL, 0, 1); break;
+ case PSI_T_FLOAT:
+ case PSI_T_DOUBLE: zend_parse_arg_double(iarg->_zv, &iarg->val.dval, NULL, 0); break;
+ case PSI_T_STRING: zend_parse_arg_str(iarg->_zv, &iarg->val.zend.str, 0); break;
+ }
+ */
+ result = psi_let_func_ex(cb->func, retval, decl_cb->func->type, decl_cb->func->var, 0, &iarg->val, iarg->_zv, &to_free);
+ // result = cb->func->handler(retval, decl_cb->func->type, iarg, &to_free);
+
+ if (result != retval) {
+ *(void **)retval = result;
+ }
+
+ zend_fcall_info_args_clear(&iarg->val.zend.cb->fci, 0);
+ for (i = 0; i < cb->args->count; ++i) {
+ zval_ptr_dtor(&zargv[i]);
+ }
+ free(zargv);
+
+ return SUCCESS;
+
}