#include "zend_operators.h"
#include "php_psi.h"
-#include "parser.h"
-#include "context.h"
#if HAVE_LIBJIT
# include "libjit.h"
zend_internal_arg_info *aip;
zend_internal_function_info *fi;
- aip = calloc(impl->func->args->count + 1, sizeof(*aip));
+ aip = calloc(impl->func->args->count + 1 + !!impl->func->args->vararg.name, sizeof(*aip));
fi = (zend_internal_function_info *) &aip[0];
+ fi->allow_null = 1;
fi->required_num_args = psi_num_min_args(impl);
fi->return_reference = impl->func->return_reference;
fi->type_hint = psi_internal_type(impl->func->return_type);
+ if (impl->func->args->vararg.name) {
+ impl_arg *vararg = impl->func->args->vararg.name;
+ zend_internal_arg_info *ai = &aip[impl->func->args->count];
+
+ ai->name = vararg->var->name;
+ ai->type_hint = psi_internal_type(vararg->type);
+ if (vararg->var->reference) {
+ ai->pass_by_reference = 1;
+ }
+ ai->is_variadic = 1;
+ }
+
for (i = 0; i < impl->func->args->count; ++i) {
impl_arg *iarg = impl->func->args->args[i];
zend_internal_arg_info *ai = &aip[i+1];
token_t t = real_decl_type(var->arg->type)->type;
impl_val tmp, *ret_val = deref_impl_val(r_val, var);
+ if ((intptr_t) ret_val->ptr <= (intptr_t) 0) {
+ RETURN_NULL();
+ }
+
array_init(return_value);
if (t == PSI_T_STRUCT) {
add_next_index_zval(return_value, &ele);
}
return;
- } else if (set->vars->count > 1) {
- /* to_array(arr_var, cnt_var[, cnt_var...], to_int(*arr_var))
- * check for length in second var
- * /
- size_t count = 0;
- zval ele;
-
- if (set->outer.set) {
- / * struct *//*
- for (i = 1; i < set->vars->count; ++i) {
- impl_val *tmp = NULL, *cnt_val;
- decl_var *cnt_var = set->vars->vars[i];
-
- cnt_val = struct_member_ref(cnt_var->arg, set->outer.val, &tmp);
- count += deref_impl_val(cnt_val, cnt_var)->lval;
-
- if (tmp) {
- free(tmp);
- }
- }
- } else {
- ZEND_ASSERT(0);
- }
-
- for (i = 0; i < count; ++i) {
- size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
- impl_val *ptr = iterate(ret_val, size, i, &tmp);
-
- set->inner[0]->func->handler(&ele, set->inner[0], ptr);
- add_next_index_zval(return_value, &ele);
- }
- */
} else if (set->num) {
/* to_array(arr_var, num_expr, to_int(*arr_var))
*/
impl_val *ret_val = deref_impl_val(r_val, var);
psi_object *obj;
- if (ret_val->ptr) {
+ if ((intptr_t) ret_val->ptr > (intptr_t) 0) {
object_init_ex(return_value, psi_class_entry);
obj = PSI_OBJ(return_value, NULL);
obj->data = ret_val->ptr;
return rv;
}
- /* set up defaults */
- for (i = 0; i < impl->func->args->count; ++i) {
- iarg = impl->func->args->args[i];
-
- if (i < EX_NUM_ARGS()) {
- iarg->_zv = ++zarg;
- ZVAL_DEREF(iarg->_zv);
-// if (iarg->var->reference) {
-// zval_dtor(iarg->_zv);
-// ZVAL_NULL(iarg->_zv);
-// }
- }
-
- if (iarg->def) {
- switch (iarg->type->type) {
- case PSI_T_BOOL:
- iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
- break;
- case PSI_T_INT:
- iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
- break;
- case PSI_T_FLOAT:
- case PSI_T_DOUBLE:
- iarg->val.dval = zend_strtod(iarg->def->text, NULL);
- break;
- case PSI_T_STRING:
- /* FIXME */
- iarg->val.zend.str = zend_string_init(&iarg->def->text[1], strlen(iarg->def->text) - 2, 0);
- break;
- }
- }
- }
-
- ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
+ ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->vararg.name ? -1 : impl->func->args->count)
nextarg:
- iarg = impl->func->args->args[_i];
- if (iarg->def) {
+ if (impl->func->args->vararg.name && _i >= impl->func->args->count) {
+ impl_arg *varg = impl->func->args->vararg.name;
+ iarg = init_impl_arg(
+ init_impl_type(varg->type->type, varg->type->name),
+ init_impl_var(varg->var->name, varg->var->reference),
+ NULL);
+
Z_PARAM_OPTIONAL;
- }
- if (PSI_T_BOOL == iarg->type->type) {
+ if (_i == impl->func->args->count) {
+ impl->func->args->vararg.args = init_impl_args(iarg);
+ } else {
+ add_impl_arg(impl->func->args->vararg.args, iarg);
+ }
+ } else {
+ iarg = impl->func->args->args[_i];
if (iarg->def) {
- iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
+ Z_PARAM_OPTIONAL;
}
+ }
+ if (PSI_T_BOOL == iarg->type->type) {
Z_PARAM_BOOL(iarg->val.zend.bval);
} else if (PSI_T_INT == iarg->type->type) {
- if (iarg->def) {
- iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
- }
Z_PARAM_LONG(iarg->val.zend.lval);
} else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
- if (iarg->def) {
- iarg->val.dval = zend_strtod(iarg->def->text, NULL);
- }
Z_PARAM_DOUBLE(iarg->val.dval);
} else if (PSI_T_STRING == iarg->type->type) {
- zend_string *str = iarg->val.zend.str;
Z_PARAM_STR_EX(iarg->val.zend.str, 1, iarg->var->reference);
- if (str && str != iarg->val.zend.str) {
- zend_string_release(str);
+ if (iarg->val.zend.str) {
+ zend_string_addref(iarg->val.zend.str);
}
} else if (PSI_T_ARRAY == iarg->type->type) {
Z_PARAM_PROLOGUE(0);
} else if (PSI_T_OBJECT == iarg->type->type) {
Z_PARAM_PROLOGUE(0);
+ } else if (PSI_T_MIXED == iarg->type->type) {
+ Z_PARAM_PROLOGUE(0);
} else {
error_code = ZPP_ERROR_FAILURE;
break;
}
+ iarg->_zv = _arg;
+ ZVAL_DEREF(iarg->_zv);
if (_i < _num_args) {
goto nextarg;
}
return FAILURE
);
+ /* set up defaults */
+ for (i = 0; i < impl->func->args->count; ++i) {
+ iarg = impl->func->args->args[i];
+
+ if (i < EX_NUM_ARGS()) {
+ } else if (iarg->def) {
+ switch (iarg->type->type) {
+ case PSI_T_BOOL:
+ iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
+ break;
+ case PSI_T_INT:
+ iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
+ break;
+ case PSI_T_FLOAT:
+ case PSI_T_DOUBLE:
+ iarg->val.dval = zend_strtod(iarg->def->text, NULL);
+ break;
+ case PSI_T_STRING:
+ /* FIXME */
+ iarg->val.zend.str = zend_string_init(&iarg->def->text[1], strlen(iarg->def->text) - 2, 0);
+ break;
+ }
+ }
+ }
+
zend_restore_error_handling(&zeh);
return SUCCESS;
}
return mem;
}
-static inline void *psi_do_let(let_stmt *let)
+static inline ZEND_RESULT_CODE psi_let_val(token_t let_func, impl_arg *iarg, impl_val *arg_val, decl_struct *strct, void **to_free)
{
- decl_arg *darg = let->var->arg;
- impl_arg *iarg = darg->let->arg;
- impl_val *arg_val = darg->ptr;
-
- if (!iarg) {
- /* let foo = calloc(1, long);
- * let foo = NULL;
- * let foo;
- */
- if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
- arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
- darg->mem = arg_val->ptr;
- } else if (darg->var->array_size) {
- arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
- darg->mem = arg_val->ptr;
+ switch (let_func) {
+ case PSI_T_BOOLVAL:
+ if (iarg->type->type == PSI_T_BOOL) {
+ arg_val->cval = iarg->val.zend.bval;
} else {
- memset(arg_val, 0, sizeof(*arg_val));
+ arg_val->cval = zend_is_true(iarg->_zv);
}
- } else {
-
- switch (darg->let->val->func->type) {
- 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_PATHVAL:
- case PSI_T_STRVAL:
- if (iarg->type->type == PSI_T_STRING) {
+ 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 = estrdup(iarg->val.zend.str->val);
- darg->mem = arg_val->ptr;
- zend_string_release(iarg->val.zend.str);
+ *to_free = arg_val->ptr;
} else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->ptr = estrdup(zs->val);
- darg->mem = arg_val->ptr;
- zend_string_release(zs);
+ arg_val->ptr = "";
}
- if (PSI_T_PATHVAL == darg->let->val->func->type) {
- if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
- efree(arg_val->ptr);
- return NULL;
- }
+ } 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 FAILURE;
}
- break;
- case PSI_T_STRLEN:
- if (iarg->type->type == PSI_T_STRING) {
+ }
+ 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;
- zend_string_release(iarg->val.zend.str);
} else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->lval = zs->len;
- zend_string_release(zs);
+ arg_val->lval = 0;
}
- break;
- case PSI_T_ARRVAL:
- if (iarg->type->type == PSI_T_ARRAY) {
- decl_type *type = real_decl_type(darg->type);
-
- switch (type->type) {
- case PSI_T_STRUCT:
- arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
- darg->mem = arg_val->ptr;
- break;
- }
+ } 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->ptr = psi_array_to_struct(strct, HASH_OF(iarg->_zv));
+ *to_free = arg_val->ptr;
+ }
+ break;
+ case PSI_T_OBJVAL:
+ if (iarg->type->type == PSI_T_OBJECT) {
+ psi_object *obj;
+
+ if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
+ return FAILURE;
}
- break;
- case PSI_T_OBJVAL:
- if (iarg->type->type == PSI_T_OBJECT) {
- psi_object *obj;
- if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
- return NULL;
- }
+ obj = PSI_OBJ(iarg->_zv, NULL);
+ arg_val->ptr = obj->data;
+ }
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ return SUCCESS;
+}
- obj = PSI_OBJ(iarg->_zv, NULL);
- arg_val->ptr = obj->data;
- }
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
+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:
+ arg_val->ptr = deref_impl_val(let->val->data.var->arg->val.ptr, let->var);
+ 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;
+ } 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;
+
+ if (SUCCESS != psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem)) {
+ return NULL;
}
}
- if (darg->let->val && darg->let->val->is_reference) {
- return darg->let->ptr = &darg->ptr;
+ if (let->val && let->val->flags.one.is_reference) {
+ return let->ptr = &darg->ptr;
} else {
- return darg->let->ptr = darg->ptr;
+ return let->ptr = darg->ptr;
}
}
ret->set->func->handler(return_value, ret->set, ret->set->vars->vars[0]->arg->ptr);
}
-static inline void psi_do_return2(zval *return_value, return_stmt *ret, impl_val *ret_val)
-{
- ret->set->func->handler(return_value, ret->set, ret_val);
-}
-
static inline void psi_do_free(free_stmt *fre)
{
size_t i, j;
- impl_val dummy;
for (i = 0; i < fre->calls->count; ++i) {
free_call *f = fre->calls->list[i];
}
/* FIXME: check in validate_* that free functions return scalar */
- PSI_ContextCall(&PSI_G(context), &dummy, f->decl);
+ PSI_ContextCall(&PSI_G(context), &f->decl->call, NULL);
}
}
darg->mem = NULL;
}
}
+
+ if (impl->func->args->vararg.args) {
+ free_impl_args(impl->func->args->vararg.args);
+ impl->func->args->vararg.args = NULL;
+ }
+ if (impl->func->args->vararg.types) {
+ efree(impl->func->args->vararg.types);
+ impl->func->args->vararg.types = NULL;
+ }
+ if (impl->func->args->vararg.values) {
+ efree(impl->func->args->vararg.values);
+ impl->func->args->vararg.values = NULL;
+ }
+ if (impl->func->args->vararg.free_list) {
+ void **list = impl->func->args->vararg.free_list;
+
+ while (*list) {
+ efree(*list++);
+ }
+
+ efree(impl->func->args->vararg.free_list);
+ impl->func->args->vararg.free_list = NULL;
+ }
}
static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val *res) {
#define PSI_CALC(var1, var2) (var1) / (var2)
PSI_CALC_FN(div)
+static inline void psi_do_args(impl *impl) {
+ size_t i;
+
+ for (i = 0; i < impl->decl->args->count; ++i) {
+ impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
+ }
+}
+
+static inline impl_vararg *psi_do_varargs(impl *impl) {
+ size_t i, j;
+ impl_vararg *va = &impl->func->args->vararg;
+ size_t vacount = va->args->count;
+
+
+ if (!vacount) {
+ return NULL;
+ }
+
+ va->types = ecalloc(vacount, sizeof(*va->types));
+ va->values = ecalloc(vacount, sizeof(*va->values));
+
+ 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;
+
+ if (vatype == PSI_T_MIXED) {
+ switch (Z_TYPE_P(vaarg->_zv)) {
+ case IS_TRUE:
+ case IS_FALSE: vatype = PSI_T_BOOL; break;
+ case IS_LONG: vatype = PSI_T_INT; break;
+ case IS_DOUBLE: vatype = PSI_T_FLOAT; break;
+ default: vatype = PSI_T_STRING; break;
+ }
+ }
+
+
+ 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_FLOAT:
+ case PSI_T_DOUBLE: let_fn = PSI_T_FLOATVAL;break;
+ case PSI_T_STRING: let_fn = PSI_T_STRVAL; break;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+
+ va->types[i] = vatype;
+ psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free);
+
+ if (to_free) {
+ if (!va->free_list) {
+ va->free_list = ecalloc(vacount - i + 1, sizeof(*va->free_list));
+ }
+ va->free_list[j++] = to_free;
+ }
+ }
+
+ return va;
+}
+
void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
{
size_t i;
- return_stmt *ret = impl->stmts->ret.list[0];
- decl_var *var = ret->set->vars->vars[0];
+ impl_vararg *va = NULL;
- memset(var->arg->ptr, 0, sizeof(impl_val));
+ memset(impl->decl->func->ptr, 0, sizeof(impl_val));
if (SUCCESS != psi_parse_args(execute_data, impl)) {
return;
let_stmt *let = impl->stmts->let.list[i];
if (!psi_do_let(let)) {
- psi_do_return(return_value, ret);
+ psi_do_return(return_value, impl->stmts->ret.list[0]);
psi_do_clean(impl);
return;
}
}
- if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
- impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
+ if (impl->decl->args) {
+ psi_do_args(impl);
+
+ if (impl->func->args->vararg.args) {
+ va = psi_do_varargs(impl);
+ }
}
- PSI_ContextCall(&PSI_G(context), var->arg->ptr, impl->decl);
- psi_do_return(return_value, ret);
+ PSI_ContextCall(&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) {
set_stmt *set = impl->stmts->set.list[i];
projects / m6w6 / ext-psi / blobdiff