defer installation of inference counter for call_with_inference_limit til after goals expanded

src/lib/builtins.pl

@@ -69,7 +69,8 @@ Module : Predicate :-
 % dynamic module resolution.
 
 :(Module, Predicate, A1) :-
-    (  atom(Module) -> '$module_call'(A1, Module, Predicate)
+    (  atom(Module) ->
+       '$module_call'(A1, Module, Predicate)
     ;  throw(error(type_error(atom, Module), (:)/2))
     ).
 
@@ -262,7 +263,7 @@ comma_dispatch_call_list([G1,G2,G3,G4,G5,G6,G7,G8|Gs]) :-
     '$call'(G6),
     '$call'(G7),
     '$call'(G8),
-    comma_dispatch_call_list(Gs).
+    '$call_with_default_policy'(comma_dispatch_call_list(Gs)).
 comma_dispatch_call_list([G1,G2,G3,G4,G5,G6,G7]) :-
     !,
     '$call'(G1),
@@ -585,7 +586,9 @@ throw(Ball) :-
     ),
     '$unwind_stack'.
 
+
 :- non_counted_backtracking '$iterate_find_all'/4.
+
 '$iterate_find_all'(Template, Goal, _, LhOffset) :-
     call(Goal),
     '$copy_to_lh'(LhOffset, Template),
@@ -601,7 +604,7 @@ truncate_lh_to(LhLength) :- '$truncate_lh_to'(LhLength).
 :- meta_predicate findall(?, 0, ?).
 
 findall(Template, Goal, Solutions) :-
-    error:can_be(list, Solutions),
+    '$call_with_default_policy'(error:can_be(list, Solutions)),
     '$lh_length'(LhLength),
     '$call_with_default_policy'(
         catch(builtins:'$iterate_find_all'(Template, Goal, Solutions, LhLength),
@@ -609,7 +612,6 @@ findall(Template, Goal, Solutions) :-
               ( builtins:truncate_lh_to(LhLength), builtins:throw(Error) ))
     ).
 
-
 :- non_counted_backtracking '$iterate_find_all_diff'/5.
 
 '$iterate_find_all_diff'(Template, Goal, _, _, LhOffset) :-
@@ -624,8 +626,8 @@ findall(Template, Goal, Solutions) :-
 :- meta_predicate findall(?, 0, ?, ?).
 
 findall(Template, Goal, Solutions0, Solutions1) :-
-    error:can_be(list, Solutions0),
-    error:can_be(list, Solutions1),
+    '$call_with_default_policy'(error:can_be(list, Solutions0)),
+    '$call_with_default_policy'(error:can_be(list, Solutions1)),
     '$lh_length'(LhLength),
     '$call_with_default_policy'(
         catch(builtins:'$iterate_find_all_diff'(Template, Goal, Solutions0,
@@ -819,13 +821,14 @@ asserta_clause(Head, Body) :-
 
 :- meta_predicate asserta(0).
 
-asserta(Clause) :-
+asserta(Clause0) :-
+    loader:strip_module(Clause0, Module, Clause),
     (  Clause \= (_ :- _) ->
        Head = Clause,
        Body = true,
-       asserta_clause(Head, Body)
+       module_asserta_clause(Head, Body, Module)
     ;  Clause = (Head :- Body) ->
-       asserta_clause(Head, Body)
+       module_asserta_clause(Head, Body, Module)
     ).
 
 module_assertz_clause(Head, Body, Module) :-
@@ -874,13 +877,14 @@ assertz_clause(Head, Body) :-
 
 :- meta_predicate assertz(0).
 
-assertz(Clause) :-
+assertz(Clause0) :-
+    loader:strip_module(Clause0, Module, Clause),
     (  Clause \= (_ :- _) ->
        Head = Clause,
        Body = true,
-       assertz_clause(Head, Body)
+       module_assertz_clause(Head, Body, Module)
     ;  Clause = (Head :- Body) ->
-       assertz_clause(Head, Body)
+       module_assertz_clause(Head, Body, Module)
     ).
 
 

src/lib/iso_ext.pl

@@ -24,10 +24,6 @@
 
 :- use_module(library(lists), [maplist/3]).
 
-:- meta_predicate(call_cleanup(0, 0)).
-
-:- meta_predicate(setup_call_cleanup(0, 0, 0)).
-
 :- meta_predicate(forall(0, 0)).
 
 forall(Generate, Test) :-
@@ -56,14 +52,17 @@ bb_get(Key, Value) :-
     ).
 
 
+% setup_call_cleanup.
+
+:- meta_predicate(call_cleanup(0, 0)).
+
 call_cleanup(G, C) :- setup_call_cleanup(true, G, C).
 
-
-% setup_call_cleanup.
+:- meta_predicate(setup_call_cleanup(0, 0, 0)).
 
 setup_call_cleanup(S, G, C) :-
     '$get_b_value'(B),
-    call(S),
+    '$call'(S),
     '$set_cp_by_default'(B),
     '$get_current_block'(Bb),
     (  C = _:CC,
@@ -72,6 +71,8 @@ setup_call_cleanup(S, G, C) :-
     ;  '$call_with_default_policy'(scc_helper(C, G, Bb))
     ).
 
+:- meta_predicate(scc_helper(?,0,?)).
+
 :- non_counted_backtracking scc_helper/3.
 scc_helper(C, G, Bb) :-
     '$get_cp'(Cp),
@@ -140,11 +141,17 @@ call_with_inference_limit(G, L, R) :-
     '$call_with_default_policy'(call_with_inference_limit(G, L, R, Bb, B)),
     '$remove_call_policy_check'(B).
 
+install_inference_counter(B, L, Count0) :-
+    '$install_inference_counter'(B, L, Count0).
+
+:- meta_predicate(call_with_inference_limit(0,?,?,?,?)).
+
 :- non_counted_backtracking call_with_inference_limit/5.
+
 call_with_inference_limit(G, L, R, Bb, B) :-
     '$install_new_block'(NBb),
     '$install_inference_counter'(B, L, Count0),
-    call(G),
+    '$call'(G),
     '$inference_level'(R, B),
     '$remove_inference_counter'(B, Count1),
     '$call_with_default_policy'(is(Diff, L - (Count1 - Count0))),