fix keysort error detection bugs

diff --git a/src/prolog/machine/machine_errors.rs b/src/prolog/machine/machine_errors.rs
index 9fe771cd072fc87e4a16843fa574644e7f30687a..118612914211eb6214082d3dd31b929e9abb15e6 100644 (file)
--- a/src/prolog/machine/machine_errors.rs
+++ b/src/prolog/machine/machine_errors.rs
@@ -56,10 +56,12 @@ impl MachineState {
             _ => {
                 let mut addr = sorted;
 
-                while let Addr::Lis(mut l) = self.store(self.deref(addr)) {
+                while let Addr::Lis(l) = self.store(self.deref(addr)) {
+                    let mut new_l = l;
+                    
                     loop {
-                        match self.heap[l].clone() {
-                            HeapCellValue::Addr(Addr::Str(new_l)) => l = new_l,
+                        match self.heap[new_l].clone() {
+                            HeapCellValue::Addr(Addr::Str(l)) => new_l = l,
                             HeapCellValue::NamedStr(2, ref name, Some(Fixity::In))
                                 if name.as_str() == "-" => break,
                             HeapCellValue::Addr(Addr::HeapCell(_)) => break,
@@ -69,7 +71,7 @@ impl MachineState {
                         };
                     }
 
-                    addr = Addr::HeapCell(l + 2);
+                    addr = self.store(self.deref(Addr::HeapCell(l + 1)));
                 }
 
                 Ok(())

diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs
index e393470a2ff7473a4a2aca10a009c1fabe3393dd..b6f0d1d35cc57177b7ff86799a1a2248d23e9010 100644 (file)
--- a/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@ -1716,7 +1716,7 @@ impl MachineState {
                         HeapCellValue::Addr(Addr::Con(Constant::EmptyList)) =>
                             break,
                         hcv =>
-                            return Err(self.type_error(ValidType::List, hcv.as_addr(l)))
+                            return Err(self.type_error(ValidType::List, a1))
                     };
                 }