#include "zend_exceptions.h"
+#include "parser.h"
#include "engine.h"
#include "calc.h"
#include "marshal.h"
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;
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;
}
-size_t psi_t_align(token_t t, size_t s)
-{
- size_t a = psi_t_alignment(t);
- return ((s - 1) | (a - 1)) + 1;
-}
-
-size_t psi_offset_padding(size_t diff, size_t alignment)
-{
- if (diff && diff <= ((diff - 1) | (alignment -1)) + 1) {
- diff = 0;
- }
-
- return diff;
-}
-
int psi_internal_type(impl_type *type)
{
switch (type->type) {
Z_PARAM_PROLOGUE(0);
} else if (PSI_T_MIXED == iarg->type->type) {
Z_PARAM_PROLOGUE(0);
+ } else if (PSI_T_CALLABLE == iarg->type->type) {
+ 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;
static inline impl_val *psi_let_val(token_t let_func, impl_arg *iarg, impl_val *arg_val, decl_struct *strct, void **to_free)
{
- 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);
- }
- break;
- case PSI_T_INTVAL:
- if (iarg->type->type == PSI_T_INT) {
- arg_val->lval = iarg->val.zend.lval;
- } else {
- arg_val->lval = zval_get_long(iarg->_zv);
- }
- 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);
- }
- 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;
- }
- }
- 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);
- }
- 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;
- }
- 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;
- }
-
- obj = PSI_OBJ(iarg->_zv, NULL);
- arg_val->ptr = obj->data;
- }
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
+ 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 void *psi_do_let(let_stmt *let)
{
decl_arg *darg = let->var->arg;
- impl_val *arg_val = darg->ptr;
- impl_arg *iarg;
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
+ memcpy(darg->ptr, deref_impl_val(let->val->data.var->arg->let, let->val->data.var), sizeof(impl_val));
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;
+ darg->val.ptr = ecalloc(darg->var->array_size, sizeof(impl_val));
+ darg->mem = darg->val.ptr;
} else {
- memset(arg_val, 0, sizeof(*arg_val));
+ memset(&darg->val, 0, sizeof(impl_val));
}
break;
case PSI_LET_CALLOC:
- arg_val->ptr = psi_do_calloc(let->val->data.alloc);
- darg->mem = arg_val->ptr;
+ darg->val.ptr = psi_do_calloc(let->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:
- arg_val->zend.lval = psi_long_num_exp(let->val->data.num, NULL);
+ darg->val.zend.lval = psi_long_num_exp(let->val->data.num, NULL);
break;
case PSI_LET_FUNC:
- iarg = let->val->data.func->arg;
-
- if (!(darg->ptr = psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem))) {
+ if (!psi_let_func(let->val->data.func, darg)) {
return NULL;
}
+ break;
}
if (let->val && let->val->flags.one.is_reference) {
- return let->ptr = &darg->ptr;
+ return darg->let = &darg->ptr;
} else {
- return let->ptr = darg->ptr;
+ return darg->let = darg->ptr;
}
}
-static inline void psi_do_set(zval *return_value, set_value *set)
-{
- 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);
-}
-
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);
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);
}
}
}
-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_stmt *let, decl_arg *darg) {
+ if (let->val->kind == PSI_LET_FUNC
+ && let->val->data.func->type == PSI_T_ARRVAL) {
decl_type *type = real_decl_type(darg->type);
if (type->type == PSI_T_STRUCT) {
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];
+ for (i = 0; i < impl->stmts->let.count; ++i) {
+ let_stmt *let = impl->stmts->let.list[i];
+ decl_arg *darg = let->var->arg;
if (darg->mem) {
- psi_clean_array_struct(darg);
+ psi_clean_array_struct(let, darg);
efree(darg->mem);
darg->mem = NULL;
}
darg->ptr = &darg->val;
+ darg->let = darg->ptr;
}
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) {
projects / m6w6 / ext-psi / blobdiff