Another TCO improvement - fact matching

trealla-prolog · Sep 30, 2024 · 4ff5b35 · 4ff5b35
1 parent c3a51ab
commit 4ff5b35
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/samples/tco.pl b/samples/tco.pl
@@ -11,8 +11,6 @@
 test3(0) :- !, statistics, nl, fail.
 test3(N) :- f(_), N1 is N-1, test3(N1).
 
-% No local vars & no structures, yet not recovered...
-
 f(_, _).
 
 test4(0) :- !, statistics, fail.

diff --git a/src/internal.h b/src/internal.h
@@ -725,7 +725,7 @@ struct query_ {
 	bool no_tco:1;
 	bool has_vars:1;
 	bool has_indirects:1;
-	bool has_compounds:1;
+	bool has_structs:1;
 	bool error:1;
 	bool did_throw:1;
 	bool trace:1;

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

diff --git a/src/unify.c b/src/unify.c
@@ -711,7 +711,7 @@ static bool unify_internal(query *q, cell *p1, pl_idx p1_ctx, cell *p2, pl_idx p
 
 	if (p1->arity || p2->arity) {
 		return unify_structs(q, p1, p1_ctx, p2, p2_ctx, depth+1);
-		if (depth) q->has_compounds = true;
+		if (depth) q->has_structs = true;
 	}
 
 	return g_disp[p1->tag].fn(q, p1, p2);