fix discussion 3359

diff --git a/src/machine/unify.rs b/src/machine/unify.rs
index e7516929350a9a790e2683c8e261807d44a9dd9e..58015ea6fde0805e680e1478da47016e31d56934 100644 (file)
--- a/src/machine/unify.rs
+++ b/src/machine/unify.rs
@@ -15,9 +15,8 @@ impl MachineState {
     pub(crate) fn partial_string_to_pdl(&mut self, pstr_loc: usize, l: usize) {
         let (c, succ_cell) = self.heap.last_str_char_and_tail(pstr_loc);
 
-        self.pdl.push((heap_loc_as_cell!(l + 1), succ_cell));
-
-        self.pdl.push((heap_loc_as_cell!(l), char_as_cell!(c)));
+        self.pdl.push((succ_cell, heap_loc_as_cell!(l + 1)));
+        self.pdl.push((char_as_cell!(c), heap_loc_as_cell!(l)));
     }
 }
 
@@ -33,7 +32,7 @@ pub(crate) trait Unifier: DerefMut<Target = MachineState> {
 
                 if n1 == n2 && a1 == a2 {
                     for idx in (0..a1).rev() {
-                        self.pdl.push((heap_loc_as_cell!(s2+1+idx), heap_loc_as_cell!(s1+1+idx)));
+                        self.pdl.push((heap_loc_as_cell!(s1+1+idx), heap_loc_as_cell!(s2+1+idx)));
                     }
                 } else {
                     self.fail = true;
@@ -42,7 +41,7 @@ pub(crate) trait Unifier: DerefMut<Target = MachineState> {
             (HeapCellValueTag::Lis, l2) => {
                 if a1 == 2 && n1 == atom!(".") {
                     for idx in (0..2).rev() {
-                        self.pdl.push((heap_loc_as_cell!(l2+1+idx), heap_loc_as_cell!(s1+1+idx)));
+                        self.pdl.push((heap_loc_as_cell!(s1+1+idx), heap_loc_as_cell!(l2+1+idx)));
                     }
                 } else {
                     self.fail = true;
@@ -70,7 +69,7 @@ pub(crate) trait Unifier: DerefMut<Target = MachineState> {
         read_heap_cell!(value,
             (HeapCellValueTag::Lis, l2) => {
                 for idx in (0..2).rev() {
-                    self.pdl.push((heap_loc_as_cell!(l2 + idx), heap_loc_as_cell!(l1 + idx)));
+                    self.pdl.push((heap_loc_as_cell!(l1 + idx), heap_loc_as_cell!(l2 + idx)));
                 }
             }
             (HeapCellValueTag::Str, s2) => {
@@ -79,7 +78,7 @@ pub(crate) trait Unifier: DerefMut<Target = MachineState> {
 
                 if a2 == 2 && n2 == atom!(".") {
                     for idx in (0..2).rev() {
-                        self.pdl.push((heap_loc_as_cell!(s2+1+idx), heap_loc_as_cell!(l1+idx)));
+                        self.pdl.push((heap_loc_as_cell!(l1+idx), heap_loc_as_cell!(s2+1+idx)));
                     }
                 } else {
                     self.fail = true;
@@ -128,7 +127,7 @@ pub(crate) trait Unifier: DerefMut<Target = MachineState> {
             (HeapCellValueTag::PStrLoc, other_pstr_loc) => {
                 match machine_st.heap.compare_pstr_segments(pstr_loc, other_pstr_loc) {
                     PStrSegmentCmpResult::Continue(v1, v2) => {
-                        machine_st.pdl.push((v1.offset_by(pstr_loc), v2.offset_by(other_pstr_loc)));
+                        machine_st.pdl.push((v2.offset_by(other_pstr_loc), v1.offset_by(pstr_loc)));
                     }
                     _ => {
                         machine_st.fail = true;

diff --git a/src/macros.rs b/src/macros.rs
index 2d96c1babfc6238edeed065d453e47b260a9134f..659eef4b5c55abff8ccc575552604496878f33b0 100644 (file)
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -402,21 +402,21 @@ macro_rules! index_store {
 
 macro_rules! unify {
     ($machine_st:expr, $($v1:expr, $v2:expr),*) => {{
-        $($machine_st.pdl.push(($v1, $v2));)*
+        $($machine_st.pdl.push(($v2, $v1));)*
         $machine_st.unify()
     }};
 }
 
 macro_rules! unify_fn {
     ($machine_st:expr, $($v1:expr, $v2: expr),*) => {{
-        $($machine_st.pdl.push(($v1, $v2));)*
+        $($machine_st.pdl.push(($v2, $v1));)*
         $machine_st.occurs_check.unify(&mut $machine_st)
     }};
 }
 
 macro_rules! unify_with_occurs_check {
     ($machine_st:expr, $($v1:expr, $v2:expr),*) => {{
-        $($machine_st.pdl.push(($v1, $v2));)*
+        $($machine_st.pdl.push(($v2, $v1));)*
         $machine_st.unify_with_occurs_check()
     }};
 }