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

add support for copying attributed variables in copy_term

Browse Source
This commit is contained in:
Mark Thom
2019-02-04 22:32:31 -07:00
parent 50dd3afaa8
commit 8e22dda747
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/prolog/copier.rs
View File

@@ -89,16 +89,14 @@ pub(crate) trait CopierTarget: IndexMut<usize, Output=HeapCellValue>
let rd = self.store(self.deref(ra)); let rd = self.store(self.deref(ra));
match rd.clone() { match rd.clone() {
Addr::HeapCell(hc) if hc >= old_h => { Addr::HeapCell(hc) if hc >= old_h =>
self[threshold] = HeapCellValue::Addr(rd); self[threshold] = HeapCellValue::Addr(rd),
}, ra @ Addr::AttrVar(_) | ra @ Addr::HeapCell(..) | ra @ Addr::StackCell(..) =>
addr @ Addr::HeapCell(..) | addr @ Addr::StackCell(..) => { if ra == rd {
if rd == addr { self.reinstantiate_var(ra, threshold, &mut trail);
self.reinstantiate_var(addr, threshold, &mut trail);
} else { } else {
self[threshold] = HeapCellValue::Addr(addr); self[threshold] = HeapCellValue::Addr(ra);
} },
},
_ => { _ => {
trail.push((Ref::HeapCell(a), self[a].clone())); trail.push((Ref::HeapCell(a), self[a].clone()));
self[a] = HeapCellValue::Addr(Addr::Lis(threshold)) self[a] = HeapCellValue::Addr(Addr::Lis(threshold))
@@ -109,7 +107,7 @@ pub(crate) trait CopierTarget: IndexMut<usize, Output=HeapCellValue>
self.push(hcv); self.push(hcv);
scan += 1; scan += 1;
}, },
Addr::AttrVar(_) | Addr::HeapCell(_) | Addr::StackCell(_, _) => { Addr::AttrVar(_) | Addr::HeapCell(_) | Addr::StackCell(_, _) => {
let ra = a; let ra = a;
let rd = self.store(self.deref(ra.clone())); let rd = self.store(self.deref(ra.clone()));
@@ -119,14 +117,22 @@ pub(crate) trait CopierTarget: IndexMut<usize, Output=HeapCellValue>
self[scan] = HeapCellValue::Addr(rd); self[scan] = HeapCellValue::Addr(rd);
scan += 1; scan += 1;
}, },
Addr::AttrVar(h) if ra == rd => {
let threshold = self.threshold();
self.push(HeapCellValue::Addr(Addr::AttrVar(threshold)));
let list_val = self[h+1].clone();
self.push(list_val);
self[scan] = HeapCellValue::Addr(Addr::AttrVar(threshold));
self[h] = HeapCellValue::Addr(Addr::AttrVar(threshold));
trail.push((Ref::AttrVar(h),
HeapCellValue::Addr(Addr::AttrVar(h))));
},
_ if ra == rd => { _ if ra == rd => {
self.reinstantiate_var(ra, scan, &mut trail); self.reinstantiate_var(ra, scan, &mut trail);
if let Addr::AttrVar(h) = rd {
let value = self[h + 1].clone();
self.push(value);
}
scan += 1; scan += 1;
}, },
_ => self[scan] = HeapCellValue::Addr(rd) _ => self[scan] = HeapCellValue::Addr(rd)