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

rollback changes in snapshot handling

Browse Source
This commit is contained in:
Mark Thom
2019-11-17 21:07:16 -04:00
parent de88fdc4dc
commit 6f9477f0bb
1 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/prolog/machine/mod.rs
View File

@@ -560,12 +560,6 @@ impl Machine {
snapshot.s = self.machine_st.s; snapshot.s = self.machine_st.s;
snapshot.tr = self.machine_st.tr; snapshot.tr = self.machine_st.tr;
snapshot.pstr_tr = self.machine_st.pstr_tr; snapshot.pstr_tr = self.machine_st.pstr_tr;
snapshot.p = self.machine_st.p.clone();
snapshot.cp = self.machine_st.cp;
snapshot.attr_var_init = mem::replace(
&mut self.machine_st.attr_var_init,
AttrVarInitializer::new(0, 0)
);
snapshot.num_of_args = self.machine_st.num_of_args; snapshot.num_of_args = self.machine_st.num_of_args;
snapshot.fail = self.machine_st.fail; snapshot.fail = self.machine_st.fail;
@@ -579,7 +573,6 @@ impl Machine {
snapshot.block = self.machine_st.block; snapshot.block = self.machine_st.block;
snapshot.ball = self.machine_st.ball.take(); snapshot.ball = self.machine_st.ball.take();
snapshot.heap_locs = mem::replace(&mut self.machine_st.heap_locs, IndexMap::new());
snapshot.lifted_heap = mem::replace(&mut self.machine_st.lifted_heap, vec![]); snapshot.lifted_heap = mem::replace(&mut self.machine_st.lifted_heap, vec![]);
snapshot snapshot
@@ -593,9 +586,6 @@ impl Machine {
self.machine_st.s = snapshot.s; self.machine_st.s = snapshot.s;
self.machine_st.tr = snapshot.tr; self.machine_st.tr = snapshot.tr;
self.machine_st.pstr_tr = snapshot.pstr_tr; self.machine_st.pstr_tr = snapshot.pstr_tr;
self.machine_st.p = snapshot.p;
self.machine_st.cp = snapshot.cp;
self.machine_st.attr_var_init = snapshot.attr_var_init;
self.machine_st.num_of_args = snapshot.num_of_args; self.machine_st.num_of_args = snapshot.num_of_args;
self.machine_st.fail = snapshot.fail; self.machine_st.fail = snapshot.fail;
@@ -613,7 +603,6 @@ impl Machine {
self.machine_st.block = snapshot.block; self.machine_st.block = snapshot.block;
self.machine_st.ball = snapshot.ball.take(); self.machine_st.ball = snapshot.ball.take();
self.machine_st.heap_locs = mem::replace(&mut snapshot.heap_locs, IndexMap::new());
self.machine_st.lifted_heap = mem::replace(&mut snapshot.lifted_heap, vec![]); self.machine_st.lifted_heap = mem::replace(&mut snapshot.lifted_heap, vec![]);
} }
@@ -637,37 +626,19 @@ impl Machine {
// so hold onto it locally and restore it after the compiler has finished. // so hold onto it locally and restore it after the compiler has finished.
self.machine_st.fail = false; self.machine_st.fail = false;
let cached_query = mem::replace(&mut self.code_repo.cached_query, vec![]); let cached_query = mem::replace(&mut self.code_repo.cached_query, vec![]);
self.dynamic_transaction(trans_type, p); self.dynamic_transaction(trans_type, p);
self.code_repo.cached_query = cached_query;
if let CodePtr::Local(LocalCodePtr::TopLevel(_, 0)) = self.machine_st.p { if let CodePtr::Local(LocalCodePtr::TopLevel(_, 0)) = self.machine_st.p {
self.code_repo.cached_query = cached_query;
break; break;
} }
self.code_repo.cached_query = cached_query;
} }
_ => _ =>
break break
}; };
} }
} }
#[cfg(test)]
pub fn test_heap_view<Outputter>(&self, mut output: Outputter) -> Outputter
where
Outputter: HCValueOutputter,
{
for (var, addr) in self.machine_st.heap_locs.iter() {
output = self.machine_st.print_var_eq(
var.clone(),
addr.clone(),
&self.indices.op_dir,
output,
);
}
output
}
} }
impl MachineState { impl MachineState {