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

remove lifetime on ReverseHeapVarDict

Browse Source
This commit is contained in:
Mark Thom
2018-12-18 21:42:34 -07:00
parent 2b774f3041
commit 5c12c3047c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/prolog/heap_print.rs
View File

@@ -119,13 +119,13 @@ impl MachineState {
} }
} }
type ReverseHeapVarDict<'a> = HashMap<Addr, Rc<Var>>; type ReverseHeapVarDict = HashMap<Addr, Rc<Var>>;
pub struct HCPrinter<'a, Outputter> { pub struct HCPrinter<'a, Outputter> {
outputter: Outputter, outputter: Outputter,
machine_st: &'a MachineState, machine_st: &'a MachineState,
state_stack: Vec<TokenOrRedirect>, state_stack: Vec<TokenOrRedirect>,
heap_locs: ReverseHeapVarDict<'a>, heap_locs: ReverseHeapVarDict,
printed_vars: HashSet<Addr>, printed_vars: HashSet<Addr>,
pub(crate) numbervars: bool, pub(crate) numbervars: bool,
pub(crate) quoted: bool, pub(crate) quoted: bool,
@@ -168,7 +168,7 @@ fn continues_with_append(atom: &str, op: &str) -> bool {
} }
fn reverse_heap_locs<'a>(machine_st: &'a MachineState, heap_locs: &'a HeapVarDict) fn reverse_heap_locs<'a>(machine_st: &'a MachineState, heap_locs: &'a HeapVarDict)
-> ReverseHeapVarDict<'a> -> ReverseHeapVarDict
{ {
heap_locs.iter().map(|(var, var_addr)| { heap_locs.iter().map(|(var, var_addr)| {
(machine_st.store(machine_st.deref(var_addr.clone())), var.clone()) (machine_st.store(machine_st.deref(var_addr.clone())), var.clone())