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

Timestamp:

Apr 17, 2011, 10:28:44 AM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: implement LispList::GetLength?.

File:

• abuse/trunk/src/lisp/lisp.cpp (modified) (27 diffs)

abuse/trunk/src/lisp/lisp.cpp

@@ -895 +895 @@
 }
 
-long list_length(void *i)
-{
-  long x;
+size_t LispList::GetLength()
+{
+    size_t ret = 0;
 
 #ifdef TYPE_CHECKING
-  if (i && item_type(i)!=(ltype)L_CONS_CELL)
-  {
-    lprint(i);
-    lbreak(" is not a sequence\n");
-    exit(0);
-  }
-#endif
-
-  for(x = 0; i; i = CDR(i))
-    x++;
-  return x;
-}
-
-    
+    if (this && item_type(this) != (ltype)L_CONS_CELL)
+    {
+        lprint(this);
+        lbreak(" is not a sequence\n");
+        exit(0);
+    }
+#endif
+
+    for (LispObject *p = this; p; p = CDR(p))
+        ret++;
+    return ret;
+}
 
 void *pairlis(void *list1, void *list2, void *list3)
-{    
+{
   if (item_type(list1)!=(ltype)L_CONS_CELL || item_type(list1)!=item_type(list2))
     return NULL;
 
   void *ret=NULL;
-  long l1=list_length(list1), l2=list_length(list2);
+  size_t l1 = ((LispList *)list1)->GetLength();
+  size_t l2 = ((LispList *)list2)->GetLength();
+
   if (l1!=l2)
-  {    
+  {
     lprint(list1);
     lprint(list2);
@@ -938 +938 @@
       if (!first) first=cur;
       if (last)
-        ((LispList *)last)->cdr=cur;
+        ((LispList *)last)->cdr=(LispObject *)cur;
       last=cur;
-    
-      LispList *cell=new_cons_cell();    
+
+      LispList *cell=new_cons_cell();
       tmp=lcar(list1);
-      ((LispList *)cell)->car=tmp;
+      ((LispList *)cell)->car = (LispObject *)tmp;
       tmp=lcar(list2);
-      ((LispList *)cell)->cdr=tmp;
-      ((LispList *)cur)->car=cell;
+      ((LispList *)cell)->cdr = (LispObject *)tmp;
+      ((LispList *)cur)->car = (LispObject *)cell;
 
       list1=((LispList *)list1)->cdr;
       list2=((LispList *)list2)->cdr;
     }
-    ((LispList *)cur)->cdr=list3;
+    ((LispList *)cur)->cdr = (LispObject *)list3;
     ret=first;
   } else ret=NULL;
@@ -1107 +1107 @@
   p_ref r1(object), r2(list);
   LispList *c=new_cons_cell();
-  c->car=object;
-  c->cdr=list;
+  c->car = (LispObject *)object;
+  c->cdr = (LispObject *)list;
   list=c;
 }
@@ -1131 +1131 @@
     c2=new_cons_cell();
     tmp=compile(s);
-    ((LispList *)c2)->car=tmp;
+    ((LispList *)c2)->car = (LispObject *)tmp;
     ((LispList *)c2)->cdr=NULL;
-    ((LispList *)cs)->cdr=c2;
+    ((LispList *)cs)->cdr = (LispObject *)c2;
     ret=cs;
   }
@@ -1144 +1144 @@
     c2=new_cons_cell();
     tmp=compile(s);
-    ((LispList *)c2)->car=tmp;
+    ((LispList *)c2)->car = (LispObject *)tmp;
     ((LispList *)c2)->cdr=NULL;
-    ((LispList *)cs)->cdr=c2;
+    ((LispList *)cs)->cdr = (LispObject *)c2;
     ret=cs;
   }  else if (n[0]==',')              // short hand for comma function
@@ -1156 +1156 @@
     c2=new_cons_cell();
     tmp=compile(s);
-    ((LispList *)c2)->car=tmp;
+    ((LispList *)c2)->car = (LispObject *)tmp;
     ((LispList *)c2)->cdr=NULL;
-    ((LispList *)cs)->cdr=c2;
+    ((LispList *)cs)->cdr = (LispObject *)c2;
     ret=cs;
   }
@@ -1187 +1187 @@
                     read_ltoken(s, n);              // skip the '.'
                     tmp=compile(s);
-                    ((LispList *)last)->cdr=tmp;          // link the last cdr to
+                    ((LispList *)last)->cdr = (LispObject *)tmp;          // link the last cdr to
                     last=NULL;
                   }
@@ -1199 +1199 @@
                   if (!first) first=cur;
                   tmp=compile(s);    
-                  ((LispList *)cur)->car=tmp;
+                  ((LispList *)cur)->car = (LispObject *)tmp;
                   if (last)
-                    ((LispList *)last)->cdr=cur;
+                    ((LispList *)last)->cdr = (LispObject *)cur;
                   last=cur;
                 }
@@ -1250 +1250 @@
       p_ref r4(cs), r5(c2);
       tmp = LispSymbol::FindOrCreate("function");
-      ((LispList *)cs)->car=tmp;
+      ((LispList *)cs)->car = (LispObject *)tmp;
       c2=new_cons_cell();
       tmp=compile(s);
-      ((LispList *)c2)->car=tmp;
-      ((LispList *)cs)->cdr=c2;
+      ((LispList *)c2)->car = (LispObject *)tmp;
+      ((LispList *)cs)->cdr = (LispObject *)c2;
       ret=cs;
     }
@@ -1515 +1515 @@
         if (first) {
           tmp=new_cons_cell();
-          ((LispList *)cur)->cdr=tmp;
+          ((LispList *)cur)->cdr = (LispObject *)tmp;
           cur=tmp;
         } else
@@ -1521 +1521 @@
     
         void *val=eval(CAR(arg_list));
-        ((LispList *)cur)->car=val;
+        ((LispList *)cur)->car = (LispObject *)val;
         arg_list=lcdr(arg_list);
       }
@@ -1582 +1582 @@
     }
   }
-  int num_args=list_length(CDR(arg_list)), i, stop=0;
+  int i, stop = 0, num_args = ((LispList *)CDR(arg_list))->GetLength();
   if (!num_args) return 0;
 
@@ -1617 +1617 @@
       else
       {
-        na_list->cdr=new_cons_cell();
+        na_list->cdr = (LispObject *)new_cons_cell();
                 na_list=(LispList *)CDR(na_list);
       }
@@ -1624 +1624 @@
       if (arg_on[i])
       {
-                na_list->car=CAR(arg_on[i]);
+                na_list->car = (LispObject *)CAR(arg_on[i]);
                 arg_on[i]=(LispList *)CDR(arg_on[i]);
       }
@@ -1632 +1632 @@
     {
       LispList *c=new_cons_cell();
-      c->car=eval_function((LispSymbol *)sym, first);
+      c->car = (LispObject *)eval_function((LispSymbol *)sym, first);
       if (return_list)
         last_return->cdr=c;
@@ -1657 +1657 @@
   if (rtype==string_symbol)
   {
-    int elements=list_length(el_list);       // see how many things we need to concat
+    int elements = ((LispList *)el_list)->GetLength(); // see how many things we need to concat
     if (!elements) ret = LispString::Create("");
     else
@@ -1758 +1758 @@
     {
       tmp=eval(CAR(CDR(args)));
-      ((LispList *)last)->cdr=tmp;
+      ((LispList *)last)->cdr = (LispObject *)tmp;
       args=NULL;
     }
@@ -1765 +1765 @@
       cur=new_cons_cell();
       if (first)
-        ((LispList *)last)->cdr=cur;
+        ((LispList *)last)->cdr = (LispObject *)cur;
       else
             first=cur;
       last=cur;
           tmp=backquote_eval(CAR(args));
-          ((LispList *)cur)->car=tmp;
+          ((LispList *)cur)->car = (LispObject *)tmp;
        args=CDR(args);
     }
@@ -1776 +1776 @@
       {
     tmp=backquote_eval(args);
-    ((LispList *)last)->cdr=tmp;
+    ((LispList *)last)->cdr = (LispObject *)tmp;
     args=NULL;
       }
@@ -1813 +1813 @@
       {
         case L_STRING : ret = LispNumber::Create(strlen(lstring_value(v))); break;
-        case L_CONS_CELL : ret = LispNumber::Create(list_length(v)); break;
+        case L_CONS_CELL : ret = LispNumber::Create(((LispList *)v)->GetLength()); break;
         default :
         { lprint(v);
@@ -1828 +1828 @@
     cur=new_cons_cell();
     void *val=eval(CAR(arg_list));
-    ((LispList *) cur)->car=val;
+    ((LispList *) cur)->car = (LispObject *)val;
     if (last)
-      ((LispList *)last)->cdr=cur;
+      ((LispList *)last)->cdr = (LispObject *)cur;
     else first=cur;
     last=cur;
@@ -1841 +1841 @@
       p_ref r1(c);
       void *val=eval(CAR(arg_list));
-      ((LispList *)c)->car=val;
+      ((LispList *)c)->car = (LispObject *)val;
       val=eval(CAR(CDR(arg_list)));
-      ((LispList *)c)->cdr=val;
+      ((LispList *)c)->cdr = (LispObject *)val;
       ret=c;
     } break;
@@ -1984 +1984 @@
             if (!car || item_type(car)!=L_CONS_CELL)
             { lprint(car); lbreak("setq car : evaled object is not a cons cell\n"); exit(0); }
-            ((LispList *)car)->car=set_to;
+            ((LispList *)car)->car = (LispObject *)set_to;
           } else if (car==cdr_symbol)
           {
@@ -1990 +1990 @@
             if (!car || item_type(car)!=L_CONS_CELL)
             { lprint(car); lbreak("setq cdr : evaled object is not a cons cell\n"); exit(0); }
-            ((LispList *)car)->cdr=set_to;
+            ((LispList *)car)->cdr = (LispObject *)set_to;
           } else if (car==aref_symbol)
           {
@@ -2051 +2051 @@
       p_ref r1(i1);
       LispList *cs=new_cons_cell();
-      cs->car=i1;
-      cs->cdr=i2;
+      cs->car = (LispObject *)i1;
+      cs->cdr = (LispObject *)i2;
       ret=cs;
     } break;
@@ -2786 +2786 @@
                 next=l1;
                 while (next) { l1=next; next=lcdr(next); }
-                ((LispList *)l1)->cdr=eval(CAR(arg_list));    
+                ((LispList *)l1)->cdr = (LispObject *)eval(CAR(arg_list));
                 arg_list=CDR(arg_list);
       } while (arg_list);
@@ -2837 +2837 @@
         if (!rstart) rstart=q;
         while (r && CDR(r)) r=CDR(r);
-        CDR(r)=q;    
+        CDR(r) = (LispObject *)q;
         arg_list=CDR(arg_list);
       }