X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fset_exp.c;h=ef4173af01e2f8d4084daa3fe321bd36b767095d;hb=09529efcde471127419e141807b83b37077003a0;hp=27ed0301b85c609fe27e5ddebf17f74d9a6db69f;hpb=7df12c88a4e14611a2585d6e7c994c59e8d7485a;p=m6w6%2Fext-psi

diff --git a/src/types/set_exp.c b/src/types/set_exp.c
index 27ed030..ef4173a 100644
--- a/src/types/set_exp.c
+++ b/src/types/set_exp.c
@@ -29,6 +29,8 @@
 #include "calc.h"
 #include "marshal.h"
 
+#include <Zend/zend_smart_str.h>
+
 struct psi_set_exp *psi_set_exp_init(enum psi_set_exp_kind kind, void *data)
 {
 	struct psi_set_exp *val = calloc(1, sizeof(*val));
@@ -50,7 +52,7 @@ struct psi_set_exp *psi_set_exp_init(enum psi_set_exp_kind kind, void *data)
 
 void psi_set_exp_exec(struct psi_set_exp *val, struct psi_call_frame *frame)
 {
-	struct psi_call_frame_symbol *frame_sym = NULL;
+	struct psi_call_frame_symbol *frame_sym;
 	struct psi_call_frame_argument *frame_arg;
 	struct psi_decl_var *set_dvar = psi_set_exp_get_decl_var(val);
 	struct psi_impl_var *set_ivar = psi_set_exp_get_impl_var(val);
@@ -75,7 +77,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:
@@ -131,7 +133,7 @@ void psi_set_exp_dump(int fd, struct psi_set_exp *set, unsigned level, int last)
 	if (set->var) {
 		/* parsed, or generated */
 		if (set->var->token) {
-			dprintf(fd, "%s = ", set->var->name);
+			dprintf(fd, "%s = ", set->var->name->val);
 		}
 	}
 
@@ -151,7 +153,7 @@ void psi_set_exp_dump(int fd, struct psi_set_exp *set, unsigned level, int last)
 	}
 
 	if (set->var) {
-		dprintf(fd, "\t/* fqn=%s */", set->var->fqn);
+		dprintf(fd, "\t/* fqn=%s */", set->var->fqn->val);
 	}
 }
 
@@ -169,39 +171,42 @@ struct psi_impl_var *psi_set_exp_get_impl_var(struct psi_set_exp *exp)
 {
 	if (!exp->var) {
 		struct psi_decl_var *dvar = psi_set_exp_get_decl_var(exp);
-		char *dollar_name;
+		zend_string *dollar_name;
+		smart_str name = {0};
 
 		if (!dvar) {
 			return NULL;
 		}
 
-		dollar_name = psi_impl_var_name_prepend(strdup("$"), dvar->name);
+		smart_str_appendc_ex(&name, '$', 1);
+		smart_str_append_ex(&name, dvar->name, 1);
+		dollar_name = smart_str_extract(&name);
 		exp->var = psi_impl_var_init(dollar_name, 0);
-		free(dollar_name);
+		zend_string_release(dollar_name);
 	}
 
 	return exp->var;
 }
 
 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);
+				PSI_WARNING, "Unknown variable '%s'", ivar->name->val);
 		return false;
 	}
 
 	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;