WIP, re issue #305

trealla-prolog · Aug 16, 2024 · d47e704 · d47e704
1 parent 958374c
commit d47e704
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/query.c b/src/query.c
@@ -626,7 +626,11 @@ static void reuse_frame(query *q, const clause *cl)
 
 	frame *f = GET_CURR_FRAME();
 	f->initial_slots = f->actual_slots = cl->nbr_vars;
+	f->has_local_vars = cl->has_local_vars;
+	f->no_tco = q->no_tco;
 	f->chgen = ++q->chgen;
+	f->heap_nbr = q->st.heap_nbr;
+	f->hp = q->st.hp;
 	f->overflow = 0;
 
 	const frame *newf = GET_FRAME(q->st.fp);
@@ -898,7 +902,7 @@ static bool resume_frame(query *q)
 
 	if (q->pl->opt
 		&& (!f->has_local_vars || !q->in_call)
-		&& !f->no_tco
+		&& !f->no_tco && 0
 		&& (q->st.fp == (q->st.curr_frame + 1))
 		&& (!q->cp || !resume_any_choices(q, f))
 		) {

diff --git a/src/unify.c b/src/unify.c
@@ -329,7 +329,9 @@ static void set_var(query *q, const cell *c, pl_idx c_ctx, cell *v, pl_idx v_ctx
 	if (is_var(v)) {
 		make_ref(&e->c, v->var_nbr, v_ctx);
 
-		if (c_ctx == q->st.fp) {
+		if ((c_ctx != q->st.curr_frame) && (v_ctx == q->st.curr_frame)) {
+			q->no_tco = true;
+		} else if (v_ctx == q->st.fp) {
 			q->no_tco = true;
 		}
 	} else if (is_compound(v)) {