More on TCO

trealla-prolog · Oct 10, 2024 · 3d5d330 · 3d5d330
1 parent ccb1f55
commit 3d5d330
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/samples/tco.pl b/samples/tco.pl
@@ -25,7 +25,7 @@
 	write(test1), write(': '), test1(1000000);
 	write(test2), write(': '), test2(1000000);
 	write(test3), write(': '), test3(1000000);
-	%write(test4), write(': '), test4(1000000);
-	%write(test5), write(': '), test5(1000000);
+	write(test4), write(': '), test4(1000000);
+	write(test5), write(': '), test5(1000000);
 	true.
 
diff --git a/src/internal.h b/src/internal.h
@@ -722,6 +722,7 @@ struct query_ {
 	bool portray_vars:1;
 	bool status:1;
 	bool no_tco:1;
+	bool no_fact:1;
 	bool has_vars:1;
 	bool error:1;
 	bool did_throw:1;

diff --git a/src/query.c b/src/query.c
@@ -691,8 +691,7 @@ static void commit_frame(query *q)
 	// Matching a ground fact (see disjunction in bif_control.c)...
 
 	if (q->pl->opt && last_match && !body
-		&& !cl->nbr_vars
-		&& !q->no_tco
+		&& !q->no_fact
 		) {
 		leave_predicate(q, q->st.pr);
 		drop_choice(q);

diff --git a/src/unify.c b/src/unify.c
@@ -323,10 +323,10 @@ static void set_var(query *q, const cell *c, pl_idx c_ctx, cell *v, pl_idx v_ctx
 		q->run_hook = true;
 
 	if (is_compound(v) && (v_ctx == q->st.fp))
-		q->no_tco = true;
+		q->no_fact = true;
 
 	if (is_managed(v))
-		q->no_tco = true;
+		q->no_fact = true;
 
 	// If anything outside the current frame points inside the
 	// current frame then we can't TCO.

diff --git a/tests/tests/test101.expected b/tests/tests/test101.expected
@@ -1,3 +1,5 @@
 test1: [4,0,3,7]
 test2: [4,0,3,7]
 test3: [4,0,3,7]
+test4: [4,0,3,7]
+test5: [4,0,3,7]
diff --git a/tests/tests/test101.pl b/tests/tests/test101.pl
@@ -25,7 +25,7 @@
 	write(test1), write(': '), test1(1000000);
 	write(test2), write(': '), test2(1000000);
 	write(test3), write(': '), test3(1000000);
-	%write(test4), write(': '), test4(1000000);
-	%write(test5), write(': '), test5(1000000);
+	write(test4), write(': '), test4(1000000);
+	write(test5), write(': '), test5(1000000);
 	true.