Changeset 638 for abuse/trunk/src/lisp/lisp.cppTweet

Timestamp:

May 11, 2011, 1:13:42 PM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: fix a confusion in the `assoc' lisp implementation usage, and
make it a LList method to avoid future breakage.

File:

• abuse/trunk/src/lisp/lisp.cpp (modified) (1 diff)

abuse/trunk/src/lisp/lisp.cpp

@@ -846 +846 @@
 }
 
-LObject *LObject::Assoc(LObject *item)
-{
-    if (item_type(this) != L_CONS_CELL)
-        return NULL;
-
-    LObject *list = this;
-    while (list)
+LList *LList::Assoc(LObject *item)
+{
+    LList *list = this;
+    while (list && item_type(list) == L_CONS_CELL
+                && item_type(CAR(list)) == L_CONS_CELL)
     {
         if (lisp_eq(CAR(CAR(list)), item))
-            return lcar(list);
-        list = CDR(list);
+            return (LList *)CAR(list);
+        list = (LList *)CDR(list);
     }