Changeset 275

Timestamp:

Jan 13, 2004, 4:52:26 PM (21 years ago)

Author:

Gary Byers

Message:

Use ENDP to detect bad alists in COPY-ALIST. Move ALT-LIST-LENGTH elsewhere
(and fix it ...)

File:

• trunk/ccl/lib/lists.lisp (modified) (3 diffs)

trunk/ccl/lib/lists.lisp

@@ -128 +128 @@
 (defun copy-alist (alist)
   "Returns a new association list equal to alist, constructed in space"
-  (if (atom alist)
-    (if alist
-      (report-bad-arg alist 'list))
+  (unless (endp alist)
     (let ((result
-           (cons (if (atom (car alist))
+           (cons (if (endp (car alist))
                    (car alist)
                    (cons (caar alist) (cdar alist)) )
@@ -140 +138 @@
                    (cdr (rplacd splice
                                 (cons
-                                 (if (atom (car x)) 
+                                 (if (endp (car x)) 
                                    (car x)
                                    (cons (caar x) (cdar x)))
                                  '() ))) ))
-          ;;; Non-null terminated alist done here.
-          ((atom x) (unless (null x)
-                      (rplacd splice x))
-           result)))))
+          ((endp x) result)))))
 
 ;;; More Commonly-used List Functions
@@ -156 +151 @@
 
 
-(defun alt-list-length (l)
-  "Detect (and complain about) cirucular lists; allow any atom to
-terminate the list"
-  (do* ((n 0 (1+ n))
-        (fast l)
-        (slow l))
-       ((atom fast) (if fast (the fixnum (1+ n)) n))
-    (declare (fixnum n))
-    (setq fast (cdr fast))
-    (if (logbitp 0 n)
-      (if (eq (setq slow (cdr slow)) fast)
-        (%err-disp $XIMPROPERLIST l)))))
+
 
 (defun butlast (list &optional (n 1 n-p))