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

replace call with $call in more meta-predicates

Browse Source
This commit is contained in:
Mark Thom
2022-06-05 20:53:07 -06:00
parent e9bb35c895
commit 336311ecc8
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/builtins.pl
View File

@@ -185,7 +185,7 @@ fail :- '$fail'.
:- meta_predicate \+(0). :- meta_predicate \+(0).
\+ G :- call(G), !, false. \+ G :- '$call'(G), !, false.
\+ _. \+ _.
@@ -195,7 +195,7 @@ _ \= _.
:- meta_predicate once(0). :- meta_predicate once(0).
once(G) :- call(G), !. once(G) :- '$call'(G), !.
repeat. repeat.
@@ -216,17 +216,17 @@ G1 -> G2 :- control_entry_point((G1 -> G2)).
staggered_if_then(G1, G2) :- staggered_if_then(G1, G2) :-
'$get_staggered_cp'(B), '$get_staggered_cp'(B),
call('$call'(G1)), '$call'(G1),
'$set_cp'(B), '$set_cp'(B),
call('$call'(G2)). '$call'(G2).
G1 ; G2 :- control_entry_point((G1 ; G2)). G1 ; G2 :- control_entry_point((G1 ; G2)).
:- non_counted_backtracking staggered_sc/2. :- non_counted_backtracking staggered_sc/2.
staggered_sc(G, _) :- call('$call'(G)). staggered_sc(G, _) :- '$call'(G).
staggered_sc(_, G) :- call('$call'(G)). staggered_sc(_, G) :- '$call'(G).
!. !.
@@ -622,10 +622,13 @@ catch(G,C,R) :-
'$get_current_block'(Bb), '$get_current_block'(Bb),
'$call_with_default_policy'(catch(G,C,R,Bb)). '$call_with_default_policy'(catch(G,C,R,Bb)).
:- meta_predicate catch(0, ?, 0, ?).
:- non_counted_backtracking catch/4. :- non_counted_backtracking catch/4.
catch(G,C,R,Bb) :- catch(G,C,R,Bb) :-
'$install_new_block'(NBb), '$install_new_block'(NBb),
call(G), '$call'(G),
'$call_with_default_policy'(end_block(Bb, NBb)). '$call_with_default_policy'(end_block(Bb, NBb)).
catch(G,C,R,Bb) :- catch(G,C,R,Bb) :-
'$reset_block'(Bb), '$reset_block'(Bb),
@@ -634,6 +637,7 @@ catch(G,C,R,Bb) :-
:- non_counted_backtracking end_block/2. :- non_counted_backtracking end_block/2.
end_block(Bb, NBb) :- end_block(Bb, NBb) :-
'$clean_up_block'(NBb), '$clean_up_block'(NBb),
'$reset_block'(Bb). '$reset_block'(Bb).
@@ -642,10 +646,11 @@ end_block(Bb, NBb) :-
'$fail'. '$fail'.
:- non_counted_backtracking handle_ball/3. :- non_counted_backtracking handle_ball/3.
handle_ball(C, C, R) :- handle_ball(C, C, R) :-
!, !,
'$erase_ball', '$erase_ball',
call(R). '$call'(R).
handle_ball(_, _, _) :- handle_ball(_, _, _) :-
'$unwind_stack'. '$unwind_stack'.
@@ -685,7 +690,7 @@ findall(Template, Goal, Solutions) :-
:- non_counted_backtracking '$iterate_find_all_diff'/5. :- non_counted_backtracking '$iterate_find_all_diff'/5.
'$iterate_find_all_diff'(Template, Goal, _, _, LhOffset) :- '$iterate_find_all_diff'(Template, Goal, _, _, LhOffset) :-
call(Goal), '$call'(Goal),
'$copy_to_lh'(LhOffset, Template), '$copy_to_lh'(LhOffset, Template),
'$fail'. '$fail'.
'$iterate_find_all_diff'(_, _, Solutions0, Solutions1, LhOffset) :- '$iterate_find_all_diff'(_, _, Solutions0, Solutions1, LhOffset) :-

4
src/machine/system_calls.rs
View File

@@ -627,6 +627,8 @@ impl MachineState {
#[inline] #[inline]
pub(crate) fn install_new_block(&mut self, value: HeapCellValue) -> usize { pub(crate) fn install_new_block(&mut self, value: HeapCellValue) -> usize {
let value = self.store(self.deref(value));
self.block = self.b; self.block = self.b;
self.unify_fixnum(Fixnum::build_with(self.block as i64), value); self.unify_fixnum(Fixnum::build_with(self.block as i64), value);
@@ -4004,7 +4006,7 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn inference_level(&mut self) { pub(crate) fn inference_level(&mut self) {
let a1 = self.machine_st.registers[1]; let a1 = self.machine_st.store(self.machine_st.deref(self.machine_st.registers[1]));
let a2 = self.machine_st.store(self.machine_st.deref(self.machine_st.registers[2])); let a2 = self.machine_st.store(self.machine_st.deref(self.machine_st.registers[2]));
let bp = cell_as_fixnum!(a2).get_num() as usize; let bp = cell_as_fixnum!(a2).get_num() as usize;