Changeset 638Tweet

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.

Location:

abuse/trunk/src

Files:

• chars.cpp (modified) (9 diffs)
• lisp/lisp.cpp (modified) (1 diff)
• lisp/lisp.h (modified) (2 diffs)

abuse/trunk/src/chars.cpp

@@ -337 +337 @@
     if (f==l_abil)
     {
-      LObject *l = CDR(CAR(field));
+      LList *l = (LList *)CDR(CAR(field));
       PtrRef r4(l);
       for (i=0; i<TOTAL_ABILITIES; i++)
       {
-    Cell *ab = LSymbol::FindOrCreate(ability_names[i])->Assoc(l);
+    Cell *ab = l->Assoc(LSymbol::FindOrCreate(ability_names[i]));
     PtrRef r5(ab);
     if (!NILP(ab))
@@ -348 +348 @@
     } else if (f==l_funs)
     {
-      LObject *l = CDR(CAR(field));
+      LList *l = (LList *)CDR(CAR(field));
       PtrRef r4(l);
       for (i=0; i<TOTAL_OFUNS; i++)
       {
-    Cell *ab = LSymbol::FindOrCreate(ofun_names[i])->Assoc(l);
+    Cell *ab = l->Assoc(LSymbol::FindOrCreate(ofun_names[i]));
     PtrRef r5(ab);
     if (!NILP(ab) && lcar(lcdr(ab)))
@@ -359 +359 @@
     } else if (f==l_flags)
     {
-      LObject *l = CDR(CAR(field));
+      LList *l = (LList *)CDR(CAR(field));
       PtrRef r4(l);
       for (i=0; i<TOTAL_CFLAGS; i++)
       {
 
-    Cell *ab = LSymbol::FindOrCreate(cflag_names[i])->Assoc(l);
+    Cell *ab = l->Assoc(LSymbol::FindOrCreate(cflag_names[i]));
     PtrRef r5(ab);
     if (!NILP(ab) && lcar(lcdr(ab))->Eval())
@@ -457 +457 @@
 
 
-  Cell *mrph = l_morph->Assoc(desc);     // check for morph info
+  Cell *mrph = desc->Assoc(l_morph);     // check for morph info
   morph_power=0;
   if (!NILP(mrph))
@@ -466 +466 @@
   } else morph_mask=-1;
 
-  Cell *sa = l_state_art->Assoc(desc);
+  Cell *sa = desc->Assoc(l_state_art);
   if (NILP(sa))
   {
@@ -485 +485 @@
   }
 
-  Cell *range = l_range->Assoc(desc);
+  Cell *range = desc->Assoc(l_range);
   if (!NILP(range))
   {
@@ -499 +499 @@
 
 
-  Cell *mf = l_fields->Assoc(desc);
+  Cell *mf = desc->Assoc(l_fields);
   if (!NILP(mf))
   {
@@ -513 +513 @@
       if (find<0)
       {
-    lprint(l_fields->Assoc(desc));
+    lprint(desc->Assoc(l_fields));
     printf("fields : no such var name \"%s\"\n",name);
     printf("current possiblities are : \n");
@@ -530 +530 @@
 
 
-  Cell *lg = l_logo->Assoc(desc);
+  Cell *lg = desc->Assoc(l_logo);
   if (NILP(lg))
   {

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);
     }
 

abuse/trunk/src/lisp/lisp.h

@@ -66 +66 @@
     /* Methods */
     LObject *Eval();
-    LObject *Assoc(LObject *item);
     void Print();
 
@@ -89 +88 @@
     /* Methods */
     size_t GetLength();
+    LList *Assoc(LObject *item);
 
     /* Members */