X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_var.h;h=ca9a5fde5bae47913e291c6b5148b033bf82c686;hp=031e2919df49d41b16ac237424d346e1c5f4d4d7;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=b78637d9020222f1032349f231c0dc84a69797bc

diff --git a/src/types/decl_var.h b/src/types/decl_var.h
index 031e291..ca9a5fd 100644
--- a/src/types/decl_var.h
+++ b/src/types/decl_var.h
@@ -31,38 +31,23 @@ struct psi_token;
 struct psi_decl_arg;
 struct psi_let_exp;
 struct psi_set_exp;
+struct psi_validate_scope;
 
 struct psi_decl_var {
 	struct psi_token *token;
-	char *name, *fqn;
+	zend_string *name, *fqn;
 	unsigned pointer_level;
 	unsigned array_size;
 	struct psi_decl_arg *arg;
 };
 
-struct psi_decl_var *psi_decl_var_init(const char *name, unsigned pl, unsigned as);
+struct psi_decl_var *psi_decl_var_init(zend_string *name, unsigned pl, unsigned as);
 struct psi_decl_var *psi_decl_var_copy(struct psi_decl_var *src);
 void psi_decl_var_free(struct psi_decl_var **var_ptr);
 void psi_decl_var_dump(int fd, struct psi_decl_var *var);
 
-#include <string.h>
-
-static inline char *psi_decl_var_name_prepend(char *current, const char *prepend) {
-	size_t c_len = strlen(current);
-	size_t p_len = strlen(prepend);
-
-	current = realloc(current, p_len + 1 + c_len + 1);
-	if (current) {
-		memmove(current + p_len + 1, current, c_len + 1);
-		current[p_len] = '.';
-		memcpy(current, prepend, p_len);
-	}
-	return current;
-}
-
 bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
-		struct psi_impl *impl, struct psi_decl *decl,
-		struct psi_let_exp *current_let_exp, struct psi_set_exp *current_set_exp);
+		struct psi_validate_scope *scope);
 
 size_t psi_decl_var_get_size(struct psi_decl_var *var);