X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fset_exp.c;h=e19e79dff7813cbbbcbac22e055276572c41c557;hp=4ae7a45f48ae1bc944b01b77e411cd575d4fb631;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=ddeb4918bce67ed63c5f4c8c4e250e92ebdef89d

diff --git a/src/types/set_exp.c b/src/types/set_exp.c
index 4ae7a45..e19e79d 100644
--- a/src/types/set_exp.c
+++ b/src/types/set_exp.c
@@ -75,7 +75,7 @@ void psi_set_exp_exec_ex(struct psi_set_exp *val, zval *zv, impl_val *iv,
 		val->data.func->handler(zv, val, iv, frame);
 		break;
 	case PSI_SET_NUMEXP:
-		switch (psi_num_exp_exec(val->data.num, iv, frame)) {
+		switch (psi_num_exp_exec(val->data.num, iv, frame, NULL)) {
 		case PSI_T_FLOAT:
 		case PSI_T_DOUBLE:
 		case PSI_T_LONG_DOUBLE:
@@ -184,11 +184,11 @@ struct psi_impl_var *psi_set_exp_get_impl_var(struct psi_set_exp *exp)
 }
 
 bool psi_set_exp_validate(struct psi_data *data, struct psi_set_exp *set,
-		struct psi_impl *impl, struct psi_decl *cb_decl)
+		struct psi_validate_scope *scope)
 {
 	struct psi_impl_var *ivar = psi_set_exp_get_impl_var(set);
 
-	if (ivar && !psi_impl_var_validate(data, ivar, impl, NULL, set)) {
+	if (ivar && !psi_impl_var_validate(data, ivar, scope)) {
 		data->error(data, ivar->token ? : **(struct psi_token ***) &set->data,
 				PSI_WARNING, "Unknown variable '%s'", ivar->name);
 		return false;
@@ -196,12 +196,12 @@ bool psi_set_exp_validate(struct psi_data *data, struct psi_set_exp *set,
 
 	switch (set->kind) {
 	case PSI_SET_NUMEXP:
-		if (!psi_num_exp_validate(data, set->data.num, impl, cb_decl, NULL, set, NULL)) {
+		if (!psi_num_exp_validate(data, set->data.num, scope)) {
 			return false;
 		}
 		break;
 	case PSI_SET_FUNC:
-		if (!psi_set_func_validate(data, set->data.func, set, impl, cb_decl)) {
+		if (!psi_set_func_validate(data, set->data.func, scope)) {
 			return false;
 		}
 		break;