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

diff --git a/src/types/set_stmt.c b/src/types/set_stmt.c
index 13aac2c..2139dc4 100644
--- a/src/types/set_stmt.c
+++ b/src/types/set_stmt.c
@@ -61,44 +61,51 @@ void psi_set_stmt_dump(int fd, struct psi_set_stmt *set)
 }
 
 
-bool psi_set_stmts_validate(struct psi_data *data, struct psi_impl *impl)
+bool psi_set_stmts_validate(struct psi_data *data, struct psi_validate_scope *scope)
 {
 	size_t i = 0;
 	struct psi_set_stmt *set;
 
 	/* we can have any count of set stmts; processing out vars */
 	/* check that set stmts reference known variables */
-	while (psi_plist_get(impl->stmts.set, i++, &set)) {
+	while (psi_plist_get(scope->impl->stmts.set, i++, &set)) {
 		if (!set->exp->var) {
 			data->error(data, set->token, PSI_WARNING,
 					"Missing variable of `set` statement of implementation '%s'",
-					impl->func->name);
+					scope->impl->func->name);
 			return false;
 		}
-		if (!psi_impl_get_arg(impl, set->exp->var)) {
+		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, impl->func->name);
+					set->exp->var->name, scope->impl->func->name);
 			return false;
 		}
 
+		scope->current_set = set->exp;
+
 		switch (set->exp->kind) {
 		case PSI_SET_NUMEXP:
 			break;
 		case PSI_SET_FUNC:
-			if (!psi_impl_get_decl_arg(impl, set->exp->data.func->var)) {
-				if (!psi_impl_get_temp_let_arg(impl, set->exp->data.func->var)) {
+			if (!psi_impl_get_decl_arg(scope->impl, set->exp->data.func->var)) {
+				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, impl->func->name);
+							set->exp->data.func->var->name, scope->impl->func->name);
+					scope->current_set = NULL;
 					return false;
 				}
 			}
 		}
+
 		/* validate the expression itself */
-		if (!psi_set_exp_validate(data, set->exp, impl, NULL)) {
+		if (!psi_set_exp_validate(data, set->exp, scope)) {
+			scope->current_set = NULL;
 			return false;
 		}
+
+		scope->current_set = NULL;
 	}
 
 	return true;