X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Flet_exp.c;h=55bf5769cbcc46bb9dcf1065d1cc85766baba30f;hp=bb9cb90a9440368fb00b96a98915ee85430d99a7;hb=b1c7c64ca1d1d9dc79a59c0f612bd07e7a997a60;hpb=77d63a537de5430f5f8f177c842fa99d65f685bf

diff --git a/src/types/let_exp.c b/src/types/let_exp.c
index bb9cb90..55bf576 100644
--- a/src/types/let_exp.c
+++ b/src/types/let_exp.c
@@ -30,6 +30,8 @@
 
 #include <assert.h>
 
+#include <Zend/zend_smart_str.h>
+
 struct psi_let_exp *psi_let_exp_init_ex(struct psi_decl_var *var,
 		enum psi_let_exp_kind kind, void *data)
 {
@@ -40,7 +42,7 @@ struct psi_let_exp *psi_let_exp_init_ex(struct psi_decl_var *var,
 
 struct psi_let_exp *psi_let_exp_init(enum psi_let_exp_kind kind, void *data)
 {
-	struct psi_let_exp *let = calloc(1, sizeof(*let));
+	struct psi_let_exp *let = pecalloc(1, sizeof(*let), 1);
 	switch (let->kind = kind) {
 	case PSI_LET_NULL:
 		assert(!data);
@@ -100,42 +102,42 @@ void psi_let_exp_free(struct psi_let_exp **let_ptr)
 	}
 }
 
-void psi_let_exp_dump(int fd, struct psi_let_exp *val, unsigned level, int last)
+void psi_let_exp_dump(struct psi_dump *dump, struct psi_let_exp *val, unsigned level, int last)
 {
 	if (level > 1) {
 		/* only if not directly after `set ...` */
-		dprintf(fd, "%s", psi_t_indent(level));
+		PSI_DUMP(dump, "%s", psi_t_indent(level));
 	}
 
 	if (val->var) {
 		if (val->var->token) {
-			psi_decl_var_dump(fd, val->var);
-			dprintf(fd, " = ");
+			psi_decl_var_dump(dump, val->var);
+			PSI_DUMP(dump, " = ");
 		}
 	}
 	if (val->is_reference) {
-		dprintf(fd, "&");
+		PSI_DUMP(dump, "&");
 	}
 
 	switch (val->kind) {
 	case PSI_LET_NULL:
-		dprintf(fd, "NULL");
+		PSI_DUMP(dump, "NULL");
 		break;
 	case PSI_LET_TMP:
-		psi_decl_var_dump(fd, val->data.var);
-		dprintf(fd, "\t/* fqn=%s */", val->data.var->fqn);
+		psi_decl_var_dump(dump, val->data.var);
+		PSI_DUMP(dump, "\t/* fqn=%s */", val->data.var->fqn->val);
 		break;
 	case PSI_LET_CALLOC:
-		psi_let_calloc_dump(fd, val->data.alloc);
+		psi_let_calloc_dump(dump, val->data.alloc);
 		break;
 	case PSI_LET_CALLBACK:
-		psi_let_callback_dump(fd, val->data.callback, level);
+		psi_let_callback_dump(dump, val->data.callback, level);
 		break;
 	case PSI_LET_FUNC:
-		psi_let_func_dump(fd, val->data.func, level);
+		psi_let_func_dump(dump, val->data.func, level);
 		break;
 	case PSI_LET_NUMEXP:
-		psi_num_exp_dump(fd, val->data.num);
+		psi_num_exp_dump(dump, val->data.num);
 		break;
 
 	default:
@@ -143,41 +145,42 @@ void psi_let_exp_dump(int fd, struct psi_let_exp *val, unsigned level, int last)
 	}
 
 	if (val->var) {
-		dprintf(fd, "\t/* fqn=%s */", val->var->fqn);
+		PSI_DUMP(dump, "\t/* fqn=%s */", val->var->fqn->val);
 	}
 
 	if (level > 1) {
 		if (!last) {
-			dprintf(fd, ",");
+			PSI_DUMP(dump, ",");
 		}
 	} else {
-		dprintf(fd, ";");
+		PSI_DUMP(dump, ";");
 	}
 }
 
 bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
-		struct psi_impl *impl)
+		struct psi_validate_scope *scope)
 {
 	struct psi_decl_var *dvar = psi_let_exp_get_decl_var(val);
 
 	switch (val->kind) {
 	case PSI_LET_TMP:
-		if (!psi_decl_var_validate(data, val->data.var, impl->decl, val, NULL)) {
+		if (!psi_decl_var_validate(data, val->data.var, scope)) {
 			data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
-					PSI_WARNING, "Unknown variable '%s'", dvar->name);
+					PSI_WARNING, "Unknown variable '%s' in temp let statment of implementation '%s'",
+					dvar->name->val, scope->impl->func->name->val);
 			return false;
 		}
 		break;
 
 	default:
-		if (!psi_decl_var_validate(data, dvar, impl->decl, val, NULL)) {
+		if (!psi_decl_var_validate(data, dvar, scope)) {
 			data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
-					PSI_WARNING, "Unknown variable '%s'", dvar->name);
+					PSI_WARNING, "Unknown variable '%s' in let statement of implementation '%s'",
+					dvar->name->val, scope->impl->func->name->val);
 			return false;
 		}
 		break;
 	}
-
 	switch (val->kind) {
 	case PSI_LET_NULL:
 		break;
@@ -188,28 +191,28 @@ bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
 		val->var->arg = val->data.var->arg;
 		break;
 	case PSI_LET_NUMEXP:
-		if (!psi_num_exp_validate(data, val->data.num, impl, NULL, val, NULL, NULL)) {
+		if (!psi_num_exp_validate(data, val->data.num, scope)) {
 			return false;
 		}
 		break;
 	case PSI_LET_CALLOC:
-		if (!psi_num_exp_validate(data, val->data.alloc->nmemb, impl, NULL, val, NULL, NULL)) {
+		if (!psi_num_exp_validate(data, val->data.alloc->nmemb, scope)) {
 			return false;
 		}
-		if (!psi_num_exp_validate(data, val->data.alloc->size, impl, NULL, val, NULL, NULL)) {
+		if (!psi_num_exp_validate(data, val->data.alloc->size, scope)) {
 			return false;
 		}
 		break;
 	case PSI_LET_CALLBACK:
-		if (!psi_let_func_validate(data, val, val->data.callback->func, impl)) {
+		if (!psi_let_func_validate(data, val->data.callback->func, scope)) {
 			return false;
 		}
-		if (!psi_let_callback_validate(data, val, val->data.callback, impl)) {
+		if (!psi_let_callback_validate(data, val->data.callback, scope)) {
 			return false;
 		}
 		break;
 	case PSI_LET_FUNC:
-		if (!psi_let_func_validate(data, val, val->data.func, impl)) {
+		if (!psi_let_func_validate(data, val->data.func, scope)) {
 			return false;
 		}
 		break;
@@ -237,8 +240,8 @@ void *psi_let_exp_exec(struct psi_let_exp *val, struct psi_decl_arg *darg,
 
 	case PSI_LET_TMP:
 		{
-			struct psi_let_stmt *let_temp = psi_impl_get_let(frame->impl,
-					val->data.var);
+			struct psi_impl *impl = psi_call_frame_get_impl(frame);
+			struct psi_let_stmt *let_temp = psi_impl_get_let(impl, val->data.var);
 			struct psi_call_frame_symbol *temp_arg;
 
 			temp_arg = psi_call_frame_fetch_symbol(frame, let_temp->exp->var);
@@ -248,8 +251,8 @@ void *psi_let_exp_exec(struct psi_let_exp *val, struct psi_decl_arg *darg,
 
 	case PSI_LET_CALLOC:
 		{
-			zend_long n = psi_long_num_exp(val->data.alloc->nmemb, frame, NULL);
-			zend_long s = psi_long_num_exp(val->data.alloc->size, frame, NULL);
+			zend_long n = psi_num_exp_get_long(val->data.alloc->nmemb, frame, NULL);
+			zend_long s = psi_num_exp_get_long(val->data.alloc->size, frame, NULL);
 			void *tmp;
 
 			if (val->data.alloc->static_memory) {
@@ -321,10 +324,11 @@ struct psi_let_func* psi_let_exp_get_func(struct psi_let_exp* exp)
 struct psi_decl_var *psi_let_exp_get_decl_var(struct psi_let_exp *val)
 {
 	if (!val->var) {
-		const char *name = psi_let_exp_get_decl_var_name(val);
+		zend_string *name = psi_let_exp_get_decl_var_name(val);
 
 		if (name) {
 			val->var = psi_decl_var_init(name, 0, 0);
+			zend_string_release(name);
 		}
 	}
 	return val->var;
@@ -336,15 +340,22 @@ struct psi_impl_var *psi_let_exp_get_impl_var(struct psi_let_exp *val)
 	return fn ? fn->var : NULL;
 }
 
-const char* psi_let_exp_get_decl_var_name(struct psi_let_exp* val)
+zend_string *psi_let_exp_get_decl_var_name(struct psi_let_exp* val)
 {
 	struct psi_impl_var* var;
+
 	if (val->var) {
-		return val->var->name;
+		return zend_string_copy(val->var->name);
 	}
+
 	var = psi_let_exp_get_impl_var(val);
 	if (var) {
-		return &var->name[1];
+		smart_str name = {0};
+
+		smart_str_appendl_ex(&name, &var->name->val[1], var->name->len - 1, 1);
+
+		return smart_str_extract(&name);
 	}
+
 	return NULL;
 }