X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fset_stmt.c;h=5d31acadb88f9612aee81b7cf625aa62cf67a0ef;hb=09529efcde471127419e141807b83b37077003a0;hp=2139dc45bd6fe7c6cabc9e85caec04b326c71902;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e;p=m6w6%2Fext-psi

diff --git a/src/types/set_stmt.c b/src/types/set_stmt.c
index 2139dc4..5d31aca 100644
--- a/src/types/set_stmt.c
+++ b/src/types/set_stmt.c
@@ -46,9 +46,7 @@ void psi_set_stmt_free(struct psi_set_stmt **set_ptr)
 
 		*set_ptr = NULL;
 		psi_set_exp_free(&set->exp);
-		if (set->token) {
-			free(set->token);
-		}
+		psi_token_free(&set->token);
 		free(set);
 	}
 }
@@ -72,13 +70,13 @@ bool psi_set_stmts_validate(struct psi_data *data, struct psi_validate_scope *sc
 		if (!set->exp->var) {
 			data->error(data, set->token, PSI_WARNING,
 					"Missing variable of `set` statement of implementation '%s'",
-					scope->impl->func->name);
+					scope->impl->func->name->val);
 			return false;
 		}
 		if (!psi_impl_get_arg(scope->impl, set->exp->var)) {
 			data->error(data, set->token, PSI_WARNING,
 					"Unknown variable '%s' of `set` statement of implementation '%s'",
-					set->exp->var->name, scope->impl->func->name);
+					set->exp->var->name->val, scope->impl->func->name->val);
 			return false;
 		}
 
@@ -92,7 +90,7 @@ bool psi_set_stmts_validate(struct psi_data *data, struct psi_validate_scope *sc
 				if (!psi_impl_get_temp_let_arg(scope->impl, set->exp->data.func->var)) {
 					data->error(data, set->token, PSI_WARNING,
 							"Unknown variable '%s' of `set` statement of implementation '%s'",
-							set->exp->data.func->var->name, scope->impl->func->name);
+							set->exp->data.func->var->name->val, scope->impl->func->name->val);
 					scope->current_set = NULL;
 					return false;
 				}