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

clean up call clause stuff.

Browse Source
This commit is contained in:
Mark Thom
2018-03-26 18:16:39 -06:00
parent b7f926bade
commit a937eb4d8c
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/prolog/machine/machine_state.rs
View File

@@ -215,6 +215,17 @@ pub struct MachineState {
pub(crate) type CallResult = Result<(), Vec<HeapCellValue>>;
pub(crate) trait CallPolicy: Any {
fn context_call<'a>(&mut self, machine_st: &mut MachineState, code_dirs: CodeDirs<'a>,
name: ClauseName, arity: usize, lco: bool)
-> CallResult
{
if lco {
self.try_execute(machine_st, code_dirs, name, arity)
} else {
self.try_call(machine_st, code_dirs, name, arity)
}
}
fn try_call<'a>(&mut self, machine_st: &mut MachineState, code_dirs: CodeDirs<'a>,
name: ClauseName, arity: usize)
-> CallResult
@@ -408,11 +419,7 @@ pub(crate) trait CallPolicy: Any {
},
&ClauseType::CallN =>
if let Some((name, arity)) = machine_st.setup_call_n(arity) {
if lco {
self.try_execute(machine_st, code_dirs, name, arity)
} else {
self.try_call(machine_st, code_dirs, name, arity)
}
self.context_call(machine_st, code_dirs, name, arity, lco)
} else {
Ok(())
},
@@ -510,11 +517,7 @@ pub(crate) trait CallPolicy: Any {
Ok(())
},
&ClauseType::Named(ref name) | &ClauseType::Op(ref name, _) =>
if lco {
self.try_execute(machine_st, code_dirs, name.clone(), arity)
} else {
self.try_call(machine_st, code_dirs, name.clone(), arity)
},
self.context_call(machine_st, code_dirs, name.clone(), arity, lco),
&ClauseType::CallWithInferenceLimit => {
machine_st.goto_ptr(CodePtr::DirEntry(393, clause_name!("builtin")), 3, lco);
Ok(())

8
src/prolog/machine/machine_state_impl.rs
View File

@@ -1285,14 +1285,14 @@ impl MachineState {
self.compare_numbers(cmp, n1, n2);
},
&BuiltInInstruction::DefaultSetCutPoint(r) => {
let mut cut_policy = DefaultCutPolicy {};
cut_policy.cut(self, r);
},
&BuiltInInstruction::DefaultRetryMeElse(o) => {
let mut call_policy = DefaultCallPolicy {};
try_or_fail!(self, call_policy.retry_me_else(self, o));
},
&BuiltInInstruction::DefaultSetCutPoint(r) => {
let mut cut_policy = DefaultCutPolicy {};
cut_policy.cut(self, r);
},
&BuiltInInstruction::DefaultTrustMe => {
let mut call_policy = DefaultCallPolicy {};
try_or_fail!(self, call_policy.trust_me(self));