Fix bugs in equality checking.

lmntal · Jul 5, 2019 · f5e2766 · f5e2766
1 parent b145256
commit f5e2766
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/vm/task.cpp b/src/vm/task.cpp
@@ -3760,6 +3760,8 @@ bool slim::vm::interpreter::exec_command(LmnReactCxt *rc, LmnRuleRef rule,
       if (!(lmn_hyperlink_at_to_hl((LmnSymbolAtomRef)rc->wt(func0)))->eq_hl(lmn_hyperlink_at_to_hl((LmnSymbolAtomRef)rc->wt(func1))))
         return FALSE;
       break;
+    case LMN_SP_ATOM_ATTR:
+      if (!SP_ATOM_EQ(rc->wt(func0), rc->wt(func1))) return FALSE;
     default:
       if (rc->wt(func0) != rc->wt(func1))
         return FALSE;
@@ -3788,6 +3790,8 @@ bool slim::vm::interpreter::exec_command(LmnReactCxt *rc, LmnRuleRef rule,
         if ((lmn_hyperlink_at_to_hl((LmnSymbolAtomRef)rc->wt(func0)))->eq_hl(lmn_hyperlink_at_to_hl((LmnSymbolAtomRef)rc->wt(func1))))
           return FALSE;
         break;
+      case LMN_SP_ATOM_ATTR:
+        if (SP_ATOM_EQ(rc->wt(func0), rc->wt(func1))) return FALSE;
       default:
         if (rc->wt(func0) == rc->wt(func1))
           return FALSE;

diff --git a/test/system_check/testsuite/guard_string/case4.lmntest b/test/system_check/testsuite/guard_string/case4.lmntest
@@ -1,3 +1,3 @@
-eq($s,$t) :- $s == $t | yes. eq("hello", 'hello'). 
+eq($s,$t) :- $s == $t | yes. eq("hello", "hell"). 
 yes. 
 ng
diff --git a/test/system_check/testsuite/guard_string/case5.lmntest b/test/system_check/testsuite/guard_string/case5.lmntest
@@ -1,3 +1,3 @@
-neq($s, $t) :- string($s), unary($t), $s \= $t | yes. neq("hello", 'hello'). 
+neq($s, $t) :- string($s), string($t), $s \= $t | yes. neq("hello", "hell"). 
 yes. 
 ok
diff --git a/test/system_check/testsuite/guard_string/case6.lmntest b/test/system_check/testsuite/guard_string/case6.lmntest
@@ -1,3 +1,3 @@
-neq($s, $t) :- string($s), string($t), $s \= $t | yes. neq("hello", 'hello'). 
+neq($s, $t) :- string($s), string($t), $s \= $t | yes. neq("hello", "hello"). 
 yes. 
 ng