rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use separate predicate for findall cleanup

Browse Source
This commit is contained in:
Mark Thom
2022-07-20 21:16:17 -06:00
parent 0aec980aa8
commit 5a08117e75
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/builtins.pl
View File

@@ -690,6 +690,12 @@ truncate_lh_to(LhLength) :- '$truncate_lh_to'(LhLength).
:- meta_predicate findall(?, 0, ?). :- meta_predicate findall(?, 0, ?).
:- non_counted_backtracking findall_cleanup/2.
findall_cleanup(LhLength, Error) :-
truncate_lh_to(LhLength),
throw(Error).
:- non_counted_backtracking findall/3. :- non_counted_backtracking findall/3.
findall(Template, Goal, Solutions) :- findall(Template, Goal, Solutions) :-
@@ -697,7 +703,7 @@ findall(Template, Goal, Solutions) :-
'$lh_length'(LhLength), '$lh_length'(LhLength),
catch(builtins:'$iterate_find_all'(Template, Goal, Solutions, LhLength), catch(builtins:'$iterate_find_all'(Template, Goal, Solutions, LhLength),
Error, Error,
( builtins:truncate_lh_to(LhLength), builtins:throw(Error) ) builtins:findall_cleanup(LhLength, Error)
). ).
:- non_counted_backtracking '$iterate_find_all_diff'/5. :- non_counted_backtracking '$iterate_find_all_diff'/5.
@@ -722,7 +728,7 @@ findall(Template, Goal, Solutions0, Solutions1) :-
catch(builtins:'$iterate_find_all_diff'(Template, Goal, Solutions0, catch(builtins:'$iterate_find_all_diff'(Template, Goal, Solutions0,
Solutions1, LhLength), Solutions1, LhLength),
Error, Error,
( builtins:truncate_lh_to(LhLength), builtins:throw(Error) ) builtins:findall_cleanup(LhLength, Error)
). ).
:- non_counted_backtracking set_difference/3. :- non_counted_backtracking set_difference/3.