realize full cheney in copier.rs

diff --git a/src/prolog/copier.rs b/src/prolog/copier.rs
index b16ba5ad44d6dd14ea1d7f074264889fd19c9b9d..0595678d592b62b261a06ddeb69349b8e1fef703 100644 (file)
--- a/src/prolog/copier.rs
+++ b/src/prolog/copier.rs
@@ -1,13 +1,12 @@
 use prolog::and_stack::*;
 use prolog::ast::*;
 
-use std::collections::HashMap;
 use std::ops::IndexMut;
 
 type Trail = Vec<(Ref, HeapCellValue)>;
 
 pub(crate) struct RedirectInfo {
-    trail: Trail    
+    trail: Trail
 }
 
 pub(crate) trait CopierTarget
@@ -40,11 +39,6 @@ pub(crate) trait CopierTarget
         let mut scan = self.source();
         let old_h = self.threshold();
 
-        // Lists have a compressed representation as structures,
-        // removing the need for NamedStr, so we use a redirection
-        // table for copying lists.
-        let mut list_redirect = HashMap::new();
-
         self.push(HeapCellValue::Addr(addr));
 
         while scan < self.threshold() {
@@ -54,15 +48,16 @@ pub(crate) trait CopierTarget
                 HeapCellValue::Addr(a) =>
                     match a.clone() {
                         Addr::Lis(a) => {
-                            if let Some(idx) = list_redirect.get(&a) {
-                                self[scan] = HeapCellValue::Addr(Addr::Lis(*idx));
-                                scan += 1;
-                                continue;
+                            if let HeapCellValue::Addr(Addr::Lis(b)) = self[a].clone() {
+                                if b >= old_h {
+                                    self[scan] = HeapCellValue::Addr(Addr::Lis(b));
+                                    scan += 1;
+                                    continue;
+                                }
                             }
 
-                            list_redirect.insert(a, self.threshold());
-                            
-                            self[scan] = HeapCellValue::Addr(Addr::Lis(self.threshold()));
+                            let threshold = self.threshold();
+                            self[scan] = HeapCellValue::Addr(Addr::Lis(threshold));
 
                             let hcv = self[a].clone();
                             self.push(hcv);
@@ -70,6 +65,9 @@ pub(crate) trait CopierTarget
                             let hcv = self[a+1].clone();
                             self.push(hcv);
 
+                            trail.push((Ref::HeapCell(a), self[a].clone()));
+                            self[a] = HeapCellValue::Addr(Addr::Lis(threshold));
+
                             scan += 1;
                         },
                         Addr::HeapCell(_) | Addr::StackCell(_, _) => {