From 17c7dbd9cec96862384c4323a0e36eb0558b580d Mon Sep 17 00:00:00 2001
From: Kimplul <kimi.h.kuparinen@gmail.com>
Date: Mon, 17 Mar 2025 21:49:25 +0200
Subject: fix some total moves

---
 src/move.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'src/move.c')

diff --git a/src/move.c b/src/move.c
index a87d6dd..6ed687b 100644
--- a/src/move.c
+++ b/src/move.c
@@ -234,6 +234,9 @@ static int total_check_single(struct state *state, struct scope *scope)
 		if (is_trivially_copyable(def->t))
 			continue;
 
+		if (is_callable(def->t))
+			continue;
+
 		struct ast_pair *prev = find_move(state, def);
 		if (prev)
 			continue;
@@ -294,10 +297,27 @@ static int mvcheck_call(struct state *state, struct ast *node)
 	if (!args)
 		return 0;
 
+	/* get all 'normal' parameters moved */
+	foreach_node(arg, call_args(node)) {
+		if (arg->k == AST_CLOSURE)
+			continue;
+
+		if (mvcheck(state, arg))
+			return -1;
+	}
+
+	/* check if there are any arguments that might not be moved if function
+	 * returns immediately */
+	if (!call_err(node) && total_check_proc(state, node->scope))
+		semantic_info(node->scope, node, "in implicit error branch");
+
+	/* check into closures */
 	int ret = 0;
 	struct state group_state = create_state(state);
-
 	foreach_node(arg, call_args(node)) {
+		if (arg->k != AST_CLOSURE)
+			continue;
+
 		struct state arg_state = create_state(state);
 		ret = mvcheck(&arg_state, arg);
 
@@ -324,10 +344,6 @@ static int mvcheck_call(struct state *state, struct ast *node)
 		push_up(&err_state);
 		destroy_state(&err_state);
 	}
-	else if (!ret) {
-		if (total_check_proc(state, node->scope))
-			semantic_info(node->scope, node, "in implicit error branch");
-	}
 
 	destroy_state(&group_state);
 	return ret;
@@ -507,6 +523,12 @@ static int mvcheck_own(struct state *state, struct ast *node)
 	struct ast *def = file_scope_find_symbol(node->scope, own_id(node));
 	assert(def);
 
+	if (is_callable(def->t)) {
+		semantic_error(node->scope, node,
+				"ownership of callable cannot be checked");
+		return -1;
+	}
+
 	struct rm_move prev = remove_move(state, def);
 	int ret = mvcheck(state, own_body(node));
 
-- 
cgit v1.2.3