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

fix exception handling when thrown by throw_exception, and within setup_call_cleanup and call_with_inference_limit.

Browse Source
This commit is contained in:
Mark Thom
2018-02-25 23:43:37 -07:00
parent c133931134
commit 07675b3675
7 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ impl MachineState {
let tr = self.tr;
let val = self.trail[tr - 1];
self.trail[i] = val;
self.tr -= 1; // NEW.
self.tr -= 1;
},
Ref::StackCell(fr, _) => {
let b = self.b - 1;
@@ -233,7 +233,7 @@ impl MachineState {
let tr = self.tr;
let val = self.trail[tr - 1];
self.trail[i] = val;
self.tr -= 1; // NEW.
self.tr -= 1;
}
}
};
@@ -937,6 +937,9 @@ impl MachineState {
fn throw_exception(&mut self, hcv: Vec<HeapCellValue>) {
let h = self.heap.h;
self.ball.0 = 0;
self.ball.1.truncate(0);
self.registers[1] = Addr::HeapCell(h);
self.heap.append(hcv);
@@ -1219,8 +1222,12 @@ impl MachineState {
self.compare_numbers(cmp, n1, n2);
},
&BuiltInInstruction::DefaultSetCutPoint(r) => {
let mut default_cut_policy = DefaultCutPolicy {};
default_cut_policy.cut(self, 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::DefaultTrustMe => {
let mut call_policy = DefaultCallPolicy {};