X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fimpl_var.c;h=7d727af6ac45df74e8c9dc6f7b5e5e445d725ce8;hp=c793500836e4b0351bbcc4397ef25e9c7a37a771;hb=a0f437f26cd0f121ee911a55327a68a3544bf15f;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/types/impl_var.c b/src/types/impl_var.c
index c793500..7d727af 100644
--- a/src/types/impl_var.c
+++ b/src/types/impl_var.c
@@ -26,12 +26,14 @@
 #include "php_psi_stdinc.h"
 #include "data.h"
 
-struct psi_impl_var *psi_impl_var_init(const char *name, bool is_reference)
+#include <Zend/zend_smart_str.h>
+
+struct psi_impl_var *psi_impl_var_init(zend_string *name, bool is_reference)
 {
-	struct psi_impl_var *var = calloc(1, sizeof(*var));
+	struct psi_impl_var *var = pecalloc(1, sizeof(*var), 1);
 
-	var->name = strdup(name);
-	var->fqn = strdup(name);
+	var->name = zend_string_copy(name);
+	var->fqn = zend_string_copy(name);
 
 	var->reference = is_reference;
 	return var;
@@ -39,12 +41,12 @@ struct psi_impl_var *psi_impl_var_init(const char *name, bool is_reference)
 
 struct psi_impl_var *psi_impl_var_copy(struct psi_impl_var *var)
 {
-	struct psi_impl_var *cpy = malloc(sizeof(*cpy));
+	struct psi_impl_var *cpy = pemalloc(sizeof(*cpy), 1);
 
 	*cpy = *var;
 
-	cpy->name = strdup(cpy->name);
-	cpy->fqn = strdup(cpy->fqn);
+	cpy->name = zend_string_copy(cpy->name);
+	cpy->fqn = zend_string_copy(cpy->fqn);
 
 	if (cpy->token) {
 		cpy->token = psi_token_copy(cpy->token);
@@ -58,34 +60,51 @@ void psi_impl_var_free(struct psi_impl_var **var_ptr)
 		struct psi_impl_var *var = *var_ptr;
 
 		*var_ptr = NULL;
-		if (var->token) {
-			free(var->token);
-		}
-		free(var->name);
-		free(var->fqn);
+		psi_token_free(&var->token);
+		zend_string_release(var->name);
+		zend_string_release(var->fqn);
 		free(var);
 	}
 }
 
+void psi_impl_var_dump(struct psi_dump *dump, struct psi_impl_var *var, bool vararg)
+{
+	PSI_DUMP(dump, "%s%s%s",
+		var->reference ? "&" : "",
+		vararg ? "..." : "",
+		var->name->val);
+}
+
+static inline zend_string *psi_impl_var_name_prepend(zend_string *current, zend_string *prepend) {
+	smart_str name = {0};
+
+	smart_str_append_ex(&name, prepend, 1);
+	smart_str_appendc_ex(&name, '.', 1);
+	smart_str_appendl_ex(&name, ZSTR_VAL(current) + 1, ZSTR_LEN(current) - 1, 1);
+	return smart_str_extract(&name);
+}
 
 bool psi_impl_var_validate(struct psi_data *data, struct psi_impl_var *ivar,
-		struct psi_impl *impl, struct psi_let_exp *let_exp,
-		struct psi_set_exp *set_exp)
+		struct psi_validate_scope *scope)
 {
-	struct psi_let_exp *current_let_exp = let_exp;
-	struct psi_set_exp *current_set_exp = set_exp;
+	if (scope && scope->current_let) {
+		struct psi_let_exp *current_let_exp = scope->current_let;
 
-	if (current_let_exp) {
 		while ((current_let_exp = current_let_exp->outer)) {
 			struct psi_impl_var *svar = psi_let_exp_get_impl_var(current_let_exp);
+			zend_string *tmp = ivar->fqn;
 
-			ivar->fqn = psi_impl_var_name_prepend(ivar->fqn, svar->name + 1);
+			ivar->fqn = psi_impl_var_name_prepend(ivar->fqn, svar->name);
+			zend_string_release(tmp);
 		}
-	} else if (current_set_exp) {
+	} else if (scope && scope->current_set) {
+		struct psi_set_exp *current_set_exp = scope->current_set;
 		while ((current_set_exp = current_set_exp->outer)) {
 			struct psi_impl_var *svar = psi_set_exp_get_impl_var(current_set_exp);
+			zend_string *tmp = ivar->fqn;
 
-			ivar->fqn = psi_impl_var_name_prepend(ivar->fqn, svar->name + 1);
+			ivar->fqn = psi_impl_var_name_prepend(ivar->fqn, svar->name);
+			zend_string_release(tmp);
 		}
 	}