fix varargs support

[m6w6/ext-psi] / src / engine.c

diff --git a/src/engine.c b/src/engine.c
index a78f9ffb6ae54cbb6377a71afe94bc837c62b93b..aa4feeb87d1e0e5ef66e0cede6d1fe1c76bf2ab3 100644 (file)
--- a/src/engine.c
+++ b/src/engine.c
@@ -449,7 +449,8 @@ static inline impl_vararg *psi_do_varargs(impl *impl) {
        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;
+               let_func_handler let_fn;
 
                if (vatype == PSI_T_MIXED) {
                        switch (Z_TYPE_P(vaarg->_zv)) {
@@ -463,17 +464,19 @@ static inline impl_vararg *psi_do_varargs(impl *impl) {
 
 
                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, &to_free)) {
                        return NULL;
                }
 
@@ -488,7 +491,7 @@ static inline impl_vararg *psi_do_varargs(impl *impl) {
        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;
@@ -496,7 +499,7 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
        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) {
@@ -505,7 +508,7 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
                if (!psi_do_let(let)) {
                        psi_do_return(return_value, impl->stmts->ret.list[0]);
                        psi_do_clean(impl);
-                       return;
+                       return FAILURE;
                }
        }
 
@@ -534,4 +537,54 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
                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 = 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;
+
 }