X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_var.c;h=7f041274aa019309f14dbc9b889a24c02d04a90f;hp=763ea1824bc29683efa346d2a9ac32cf6e03d5ab;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/types/decl_var.c b/src/types/decl_var.c
index 763ea18..7f04127 100644
--- a/src/types/decl_var.c
+++ b/src/types/decl_var.c
@@ -32,8 +32,10 @@ struct psi_decl_var *psi_decl_var_init(const char *name, unsigned pl,
 		unsigned as)
 {
 	struct psi_decl_var *v = calloc(1, sizeof(*v));
-	v->name = strdup(name);
-	v->fqn = strdup(name);
+	if (name) {
+		v->name = strdup(name);
+		v->fqn = strdup(name);
+	}
 	v->pointer_level = pl;
 	v->array_size = as;
 	return v;
@@ -44,8 +46,11 @@ struct psi_decl_var *psi_decl_var_copy(struct psi_decl_var *src)
 	struct psi_decl_var *dest = calloc(1, sizeof(*dest));
 
 	*dest = *src;
-	dest->name = strdup(dest->name);
-	dest->fqn = strdup(dest->fqn);
+
+	if (dest->name) {
+		dest->name = strdup(dest->name);
+		dest->fqn = strdup(dest->fqn);
+	}
 
 	if (dest->token) {
 		dest->token = psi_token_copy(dest->token);
@@ -62,8 +67,10 @@ void psi_decl_var_free(struct psi_decl_var **var_ptr)
 		if (var->token) {
 			free(var->token);
 		}
-		free(var->name);
-		free(var->fqn);
+		if (var->name) {
+			free(var->name);
+			free(var->fqn);
+		}
 		free(var);
 	}
 }
@@ -72,21 +79,20 @@ void psi_decl_var_dump(int fd, struct psi_decl_var *var)
 {
 	dprintf(fd, "%s%s",
 			psi_t_indirection(var->pointer_level - !!var->array_size),
-			var->name);
+			var->name ? var->name : "/**/");
 	if (var->array_size) {
 		dprintf(fd, "[%u]", var->array_size);
 	}
 }
 
 bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
-		struct psi_decl *decl, struct psi_let_exp *let_exp,
-		struct psi_set_exp *set_exp)
+		struct psi_validate_scope *scope)
 {
 	bool okay = false;
-	struct psi_let_exp *current_let_exp = let_exp;
-	struct psi_set_exp *current_set_exp = set_exp;
 
-	if (current_let_exp) {
+	if (scope && scope->current_let) {
+		struct psi_let_exp *current_let_exp = scope->current_let;
+
 		/* walk up the let expression tree until found */
 		while ((current_let_exp = current_let_exp->outer)) {
 			struct psi_decl_var *svar = current_let_exp->var;
@@ -107,7 +113,9 @@ bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
 				dvar->fqn = psi_decl_var_name_prepend(dvar->fqn, svar->name);
 			}
 		}
-	} else if (current_set_exp) {
+	} else if (scope && scope->current_set) {
+		struct psi_set_exp *current_set_exp = scope->current_set;
+
 		/* walk up the set expression tree until found */
 		while ((current_set_exp = current_set_exp->outer)) {
 			struct psi_decl_var *svar = psi_set_exp_get_decl_var(
@@ -130,7 +138,10 @@ bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
 		}
 	}
 
-	if (decl && !okay && psi_decl_get_arg(decl, dvar)) {
+	if (!okay && scope && scope->impl && psi_impl_get_decl_arg(scope->impl, dvar)) {
+		okay = true;
+	}
+	if (!okay && scope && scope->cb_decl && psi_decl_get_arg(scope->cb_decl, dvar)) {
 		okay = true;
 	}