use separate predicate for findall cleanup

diff --git a/src/lib/builtins.pl b/src/lib/builtins.pl
index 8e4553ce226d16194382b3a36b63d80fe997b0b1..dd7fb5470f3057eacb31a41d6f4ea95ea8d5daa0 100644 (file)
--- a/src/lib/builtins.pl
+++ b/src/lib/builtins.pl
@@ -690,6 +690,12 @@ truncate_lh_to(LhLength) :- '$truncate_lh_to'(LhLength).
 
 :- 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.
 
 findall(Template, Goal, Solutions) :-
@@ -697,7 +703,7 @@ findall(Template, Goal, Solutions) :-
     '$lh_length'(LhLength),
     catch(builtins:'$iterate_find_all'(Template, Goal, Solutions, LhLength),
           Error,
-          ( builtins:truncate_lh_to(LhLength), builtins:throw(Error) )
+          builtins:findall_cleanup(LhLength, Error)
          ).
 
 :- 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,
                                             Solutions1, LhLength),
           Error,
-          ( builtins:truncate_lh_to(LhLength), builtins:throw(Error) )
+          builtins:findall_cleanup(LhLength, Error)
          ).
 
 :- non_counted_backtracking set_difference/3.