#ifdef HAVE_CONFIG_H
# include "config.h"
+#else
+# include "php_config.h"
#endif
#include "php.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)
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)
-{
- abort();
- return arg_val;
-}
-
-static inline impl_val *psi_let_func(let_func *func, decl_arg *darg) {
- return darg->ptr = func->handler(darg->ptr, darg->type, func->var->arg, &darg->mem);
-}
+static inline impl_val *psi_let_func(let_func *func, decl_arg *darg);
-static inline void *psi_do_let(let_stmt *let)
+static inline void *psi_let_val(let_val *val, decl_arg *darg)
{
- decl_arg *darg = let->var->arg;
+ ZEND_ASSERT(darg);
- switch (let->val ? let->val->kind : PSI_LET_NULL) {
+ switch (val ? val->kind : PSI_LET_NULL) {
case PSI_LET_TMP:
- memcpy(darg->ptr, deref_impl_val(let->val->data.var->arg->let, let->val->data.var), sizeof(impl_val));
+ memcpy(darg->ptr, deref_impl_val(val->data.var->arg->let, val->data.var), sizeof(impl_val));
break;
case PSI_LET_NULL:
if (darg->var->array_size) {
}
break;
case PSI_LET_CALLOC:
- darg->val.ptr = psi_do_calloc(let->val->data.alloc);
+ darg->val.ptr = psi_do_calloc(val->data.alloc);
darg->mem = darg->val.ptr;
break;
- case PSI_LET_CALLBACK:
- darg->val.ptr = let->val->data.callback->decl->call.sym;
- break;
case PSI_LET_NUMEXP:
- darg->val.zend.lval = psi_long_num_exp(let->val->data.num, NULL);
+ darg->val.zend.lval = psi_long_num_exp(val->data.num, NULL);
+ break;
+ case PSI_LET_CALLBACK:
+ darg->val.ptr = val->data.callback->decl->call.sym;
break;
case PSI_LET_FUNC:
- if (!psi_let_func(let->val->data.func, darg)) {
+ if (!(darg->ptr = psi_let_func(val->data.func, darg))) {
return NULL;
}
break;
}
- if (let->val && let->val->flags.one.is_reference) {
+ if (val && val->flags.one.is_reference) {
return darg->let = &darg->ptr;
} else {
return darg->let = darg->ptr;
}
}
+static void *marshal_func(void *cb_ctx, impl_val **ptr, decl_arg *spec, token_t cast, zval *zv, void **tmp) {
+ let_vals *vals = cb_ctx;
+ size_t i;
+
+ for (i = 0; i < vals->count; ++i) {
+ impl_var *var = locate_let_val_impl_var(vals->vals[i]);
+
+ if (!strcmp(&var->name[1], spec->var->name)) {
+ return *ptr = psi_let_val(vals->vals[i], spec);
+ }
+ }
+
+ return *ptr = NULL;
+}
+
+static inline impl_val *psi_let_func(let_func *func, decl_arg *darg) {
+ impl_arg *iarg = func->var->arg;
+
+ if (func->outer && !iarg) {
+ impl_arg *outer_arg = locate_let_val_impl_var(func->outer)->arg;
+ iarg = init_impl_arg(
+ init_impl_type(PSI_T_MIXED, "mixed"),
+ copy_impl_var(func->var), NULL);
+
+
+ if (!(iarg->_zv = zend_hash_str_find(Z_ARRVAL_P(outer_arg->_zv), &iarg->var->name[1], strlen(iarg->var->name)-1))) {
+ iarg->_zv = ecalloc(1, sizeof(*iarg->_zv));
+ }
+ }
+
+ switch (func->type) {
+ case PSI_T_BOOLVAL:
+ return psi_let_boolval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_INTVAL:
+ return psi_let_intval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_FLOATVAL:
+ return psi_let_floatval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_STRVAL:
+ return psi_let_strval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_STRLEN:
+ return psi_let_strlen(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_PATHVAL:
+ return psi_let_pathval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_OBJVAL:
+ return psi_let_objval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_ZVAL:
+ return psi_let_zval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ case PSI_T_VOID:
+ return psi_let_void(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ break;
+ case PSI_T_ARRVAL:
+ if (func->inner) {
+ size_t i;
+ decl_type *real = real_decl_type(darg->type);
+
+ if (iarg->type->type != PSI_T_ARRAY) {
+ SEPARATE_ARG_IF_REF(iarg->_zv);
+ convert_to_array(iarg->_zv);
+ }
+
+ return psi_array_to_struct_ex(real->real.strct, Z_ARRVAL_P(iarg->_zv), marshal_func, func->inner);
+ } else {
+ return psi_let_arrval(darg->ptr, darg->type, iarg->type->type, &iarg->val, iarg->_zv, &darg->mem);
+ }
+ break;
+ default:
+ assert(0);
+ }
+ return NULL;
+
+ // return darg->ptr = func->handler(darg->ptr, darg->type, func->var->arg, &darg->mem);
+}
+
+static inline void *psi_do_let(let_stmt *let)
+{
+ return psi_let_val(let->val, let->var->arg);
+}
+
static inline void psi_do_return(zval *return_value, return_stmt *ret)
{
ret->set->func->handler(return_value, ret->set, ret->set->vars->vars[0]->arg->ptr);
}
/* 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);
}
}
while (*ptr) {
efree(*ptr++);
}
+ } else if (type->type == PSI_T_STRUCT) {
+ void **ptr = (void **) ((char *) darg->mem + type->real.unn->size);
+
+ if (*ptr) {
+ efree(*ptr);
+ }
}
}
}
case PSI_T_STRUCT:
impl->decl->func->ptr = psi_array_to_struct(real->real.strct, NULL);
break;
+ case PSI_T_UNION:
+ impl->decl->func->ptr = psi_array_to_union(real->real.unn, NULL);
+ break;
}
}
}
impl_arg *vaarg = va->args->args[i];
void *to_free = NULL;
token_t vatype = va->name->type->type;
- let_func_handler let_fn;
+ psi_marshal_let let_fn;
if (vatype == PSI_T_MIXED) {
switch (Z_TYPE_P(vaarg->_zv)) {
}
}
- 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) {
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);
+ result = NULL;//cb->func->handler(retval, decl_cb->func->type, iarg, &to_free);
if (result != retval) {
*(void **)retval = result;