From 1985734990b5c5ab3fd50277bff854ea3cd92b2c Mon Sep 17 00:00:00 2001
From: Teddy <ted.sybil@gmail.com>
Date: Fri, 9 Aug 2013 22:18:39 +0800
Subject: fixed bug in `equal?`

---
 builtin.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'builtin.cpp')

diff --git a/builtin.cpp b/builtin.cpp
index 98090e0..115377c 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -1335,9 +1335,8 @@ do { \
         int otype = (a = *l1)->get_otype();
         if (otype != (b = *l2)->get_otype())
             return new BoolObj(false);
-        if (a == empty_list)
-            continue;
-        if (otype & CLS_PAIR_OBJ)
+        if (a != empty_list && b != empty_list &&
+            otype & CLS_PAIR_OBJ)
         {
             *r1 = TO_PAIR(a)->car;
             INC1(r1);
@@ -1363,7 +1362,7 @@ do { \
                     it = va->vec.begin();
                     it != va->vec.end(); it++)
             {
-                *r1 = TO_PAIR(a)->car;
+                *r1 = *it;
                 INC1(r1);
                 CHK1;
             }
@@ -1372,7 +1371,7 @@ do { \
                     it = vb->vec.begin();
                     it != vb->vec.end(); it++)
             {
-                *r2 = TO_PAIR(b)->car;
+                *r2 = *it;
                 INC2(r2);
                 CHK2;
             }
@@ -1418,6 +1417,8 @@ do { \
                 static_cast<StrObj*>(b)->str)
                 return new BoolObj(false); // (string=?)
         }
+        else if (a != b)
+            return new BoolObj(false);
     }
     return new BoolObj(true);
 }
-- 
cgit v1.2.3