comparison lisp/cl-extra.el @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20
author cvs
date Mon, 13 Aug 2007 11:26:11 +0200
parents 697ef44129c6
children
comparison
equal deleted inserted replaced
423:28d9c139be4c 424:11054d720c21
181 (cl-push (funcall cl-func cl-list) cl-res) 181 (cl-push (funcall cl-func cl-list) cl-res)
182 (setq cl-list (cdr cl-list))) 182 (setq cl-list (cdr cl-list)))
183 (nreverse cl-res)))) 183 (nreverse cl-res))))
184 184
185 185
186 ;; mapc is now in C, renamed from `mapc-internal'. 186 (defun mapc (cl-func cl-seq &rest cl-rest)
187 187 "Like `mapcar', but does not accumulate values returned by the function."
188 ;(defun mapc (cl-func cl-seq &rest cl-rest) 188 (if cl-rest
189 ; "Like `mapcar', but does not accumulate values returned by the function." 189 (apply 'map nil cl-func cl-seq cl-rest)
190 ; (if cl-rest 190 ;; XEmacs change: in the simplest case we call mapc-internal,
191 ; (apply 'map nil cl-func cl-seq cl-rest) 191 ;; which really doesn't accumulate any results.
192 ; ;; XEmacs change: we call mapc-internal, which really doesn't 192 (mapc-internal cl-func cl-seq))
193 ; ;; accumulate any results. 193 cl-seq)
194 ; (mapc-internal cl-func cl-seq))
195 ; cl-seq)
196 194
197 (defun mapl (cl-func cl-list &rest cl-rest) 195 (defun mapl (cl-func cl-list &rest cl-rest)
198 "Like `maplist', but does not accumulate values returned by the function." 196 "Like `maplist', but does not accumulate values returned by the function."
199 (if cl-rest 197 (if cl-rest
200 (apply 'maplist cl-func cl-list cl-rest) 198 (apply 'maplist cl-func cl-list cl-rest)
672 ;;; Hash tables. 670 ;;; Hash tables.
673 671
674 ;; The `regular' Common Lisp hash-table stuff has been moved into C. 672 ;; The `regular' Common Lisp hash-table stuff has been moved into C.
675 ;; Only backward compatibility stuff remains here. 673 ;; Only backward compatibility stuff remains here.
676 (defun make-hashtable (size &optional test) 674 (defun make-hashtable (size &optional test)
677 (make-hash-table :size size :test test :type 'non-weak)) 675 (make-hash-table :test test :size size))
678 (defun make-weak-hashtable (size &optional test) 676 (defun make-weak-hashtable (size &optional test)
679 (make-hash-table :size size :test test :type 'weak)) 677 (make-hash-table :test test :size size :weakness t))
680 (defun make-key-weak-hashtable (size &optional test) 678 (defun make-key-weak-hashtable (size &optional test)
681 (make-hash-table :size size :test test :type 'key-weak)) 679 (make-hash-table :test test :size size :weakness 'key))
682 (defun make-value-weak-hashtable (size &optional test) 680 (defun make-value-weak-hashtable (size &optional test)
683 (make-hash-table :size size :test test :type 'value-weak)) 681 (make-hash-table :test test :size size :weakness 'value))
684 682
685 (define-obsolete-function-alias 'hashtablep 'hash-table-p) 683 (define-obsolete-function-alias 'hashtablep 'hash-table-p)
686 (define-obsolete-function-alias 'hashtable-fullness 'hash-table-count) 684 (define-obsolete-function-alias 'hashtable-fullness 'hash-table-count)
687 (define-obsolete-function-alias 'hashtable-test-function 'hash-table-test) 685 (define-obsolete-function-alias 'hashtable-test-function 'hash-table-test)
688 (define-obsolete-function-alias 'hashtable-type 'hash-table-type) 686 (define-obsolete-function-alias 'hashtable-type 'hash-table-type)
691 689
692 (make-obsolete 'make-hashtable 'make-hash-table) 690 (make-obsolete 'make-hashtable 'make-hash-table)
693 (make-obsolete 'make-weak-hashtable 'make-hash-table) 691 (make-obsolete 'make-weak-hashtable 'make-hash-table)
694 (make-obsolete 'make-key-weak-hashtable 'make-hash-table) 692 (make-obsolete 'make-key-weak-hashtable 'make-hash-table)
695 (make-obsolete 'make-value-weak-hashtable 'make-hash-table) 693 (make-obsolete 'make-value-weak-hashtable 'make-hash-table)
694 (make-obsolete 'hash-table-type 'hash-table-weakness)
696 695
697 (when (fboundp 'x-keysym-hash-table) 696 (when (fboundp 'x-keysym-hash-table)
698 (make-obsolete 'x-keysym-hashtable 'x-keysym-hash-table)) 697 (make-obsolete 'x-keysym-hashtable 'x-keysym-hash-table))
699 698
700 ;; Compatibility stuff for old kludgy cl.el hash table implementation 699 ;; Compatibility stuff for old kludgy cl.el hash table implementation