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

fix attributed variables dealing with NeckCut on return

Browse Source
This commit is contained in:
Mark Thom
2019-02-12 08:38:46 -07:00
parent e36485533d
commit 06021e2373
4 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/prolog/machine/system_calls.rs
View File

@@ -451,9 +451,19 @@ impl MachineState {
},
&SystemClauseType::RestoreCodePtrFromSpecialFormCP => {
let e = self.e;
let frame_len = self.and_stack[e].len();
for i in 1 .. self.and_stack[e].len() + 1 {
for i in 1 .. frame_len - 1 {
self[RegType::Temp(i)] = self.and_stack[e][i].clone();
}
if let &Addr::Con(Constant::Usize(b0)) = &self.and_stack[e][frame_len - 1] {
self.b0 = b0;
}
if let &Addr::Con(Constant::Usize(num_of_args)) = &self.and_stack[e][frame_len] {
self.num_of_args = num_of_args;
}
self.p = CodePtr::Local(self.and_stack[e].special_form_cp);
@@ -576,6 +586,8 @@ impl MachineState {
for item in iter {
match item {
HeapCellValue::Addr(Addr::AttrVar(h)) =>
vars.push(Ref::AttrVar(h)),
HeapCellValue::Addr(Addr::HeapCell(h)) =>
vars.push(Ref::HeapCell(h)),
HeapCellValue::Addr(Addr::StackCell(fr, sc)) =>