From: Mark Thom <markjordanthom@gmail.com>
Date: Sun, 26 Aug 2018 08:03:16 +0000 (-0600)
Subject: modify structural_eq_test
X-Git-Tag: v0.8.110~422
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=5afa4a7848b6b9347b5e80ec1e44e189c203fd8a;p=scryer-prolog.git

modify structural_eq_test
---

diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs
index 850b0068..ee68a2e5 100644
--- a/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@ -337,7 +337,15 @@ impl MachineState {
             Addr::StackCell(fr, sc) => {
                 self.and_stack[fr][sc] = Addr::Con(c.clone());
                 self.trail(Ref::StackCell(fr, sc));
-            },
+            },            
+            Addr::Con(Constant::String(s)) =>            
+                self.fail = match c {
+                    Constant::EmptyList
+                      if self.flags.double_quotes.is_chars() =>
+                        !s.is_empty(),
+                    Constant::String(s2) => s != s2,
+                    _ => true
+                },
             Addr::Con(c1) => {
                 if c1 != c {
                     self.fail = true;
@@ -1770,19 +1778,7 @@ impl MachineState {
                  HeapCellValue::Addr(Addr::Con(Constant::String(ref s))))
                     if self.flags.double_quotes.is_chars() => if !s.is_empty() {
                         return true;
-                    },
-                (HeapCellValue::Addr(Addr::Con(Constant::Atom(atom))),
-                 HeapCellValue::Addr(Addr::Con(Constant::Char(c))))
-              | (HeapCellValue::Addr(Addr::Con(Constant::Char(c))),
-                 HeapCellValue::Addr(Addr::Con(Constant::Atom(atom)))) => {
-                  if atom.as_str().chars().count() == 1 {
-                      if Some(c) == atom.as_str().chars().next() {
-                          continue;
-                      }
-                  }
-                  
-                  return true;
-                },
+                    },                
                 (HeapCellValue::NamedStr(ar1, n1, _), HeapCellValue::NamedStr(ar2, n2, _)) =>
                     if ar1 != ar2 || n1 != n2 {
                         return true;