Mercurial > hg > xemacs-beta
comparison lisp/cl.el @ 5327:d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
src/ChangeLog addition:
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
Move the heavy lifting from cl-seq.el to C, finally making those
functions first-class XEmacs citizens, with circularity checking,
built-in support for tests other than #'eql, and as much
compatibility with current Common Lisp as Paul Dietz' tests require.
* fns.c (check_eq_nokey, check_eq_key, check_eql_nokey)
(check_eql_key, check_equal_nokey, check_equal_key)
(check_equalp_nokey, check_equalp_key, check_string_match_nokey)
(check_string_match_key, check_other_nokey, check_other_key)
(check_if_nokey, check_if_key, check_match_eq_key)
(check_match_eql_key, check_match_equal_key)
(check_match_equalp_key, check_match_other_key): New. These are
basically to provide function pointers to be used by Lisp
functions that take TEST, TEST-NOT and KEY arguments.
(get_check_match_function_1, get_check_test_function)
(get_check_match_function): These functions work out which of the
previous list of functions to use, given the keywords supplied by
the user.
(count_with_tail): New. This is the bones of #'count.
(list_count_from_end, string_count_from_end): Utility functions
for #'count.
(Fcount): New, moved from cl-seq.el.
(list_position_cons_before): New. The implementation of #'member*,
and important in implementing various other functions.
(FmemberX, Fadjoin, FassocX, FrassocX, Fposition, Ffind)
(FdeleteX, FremoveX, Fdelete_duplicates, Fremove_duplicates)
(Fnsubstitute, Fsubstitute, Fsublis, Fnsublis, Fsubst, Fnsubst)
(Ftree_equal, Fmismatch, Fsearch, Fintersection, Fnintersection)
(Fsubsetp, Fset_difference, Fnset_difference, Fnunion, Funion)
(Fset_exclusive_or, Fnset_exclusive_or): New, moved here from
cl-seq.el.
(position): New. The implementation of #'find and #'position.
(list_delete_duplicates_from_end, subst, sublis, nsublis)
(tree_equal, mismatch_from_end, mismatch_list_list)
(mismatch_list_string, mismatch_list_array)
(mismatch_string_array, mismatch_string_string)
(mismatch_array_array, get_mismatch_func): Helper C functions for
the Lisp-visible functions.
(venn, nvenn): New. The implementation of the main Lisp functions that
treat lists as sets.
lisp/ChangeLog addition:
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 30 Dec 2010 01:59:52 +0000 |
parents | 203dcac81dae |
children | 38e24b8be4ea 89331fa1c819 |
comparison
equal
deleted
inserted
replaced
5323:f87bb35a6b94 | 5327:d1b17a33450b |
---|---|
554 (defalias 'cl-floor 'floor*) | 554 (defalias 'cl-floor 'floor*) |
555 (defalias 'cl-ceiling 'ceiling*) | 555 (defalias 'cl-ceiling 'ceiling*) |
556 (defalias 'cl-truncate 'truncate*) | 556 (defalias 'cl-truncate 'truncate*) |
557 (defalias 'cl-round 'round*) | 557 (defalias 'cl-round 'round*) |
558 (defalias 'cl-mod 'mod*) | 558 (defalias 'cl-mod 'mod*) |
559 | |
560 (defun adjoin (cl-item cl-list &rest cl-keys) ; See compiler macro in cl-macs | |
561 "Return ITEM consed onto the front of LIST only if it's not already there. | |
562 Otherwise, return LIST unmodified. | |
563 Keywords supported: :test :test-not :key | |
564 See `member*' for the meaning of :test, :test-not and :key." | |
565 (cond ((or (equal cl-keys '(:test eq)) | |
566 (and (null cl-keys) (not (numberp cl-item)))) | |
567 (if (memq cl-item cl-list) cl-list (cons cl-item cl-list))) | |
568 ((or (equal cl-keys '(:test equal)) (null cl-keys)) | |
569 (if (member cl-item cl-list) cl-list (cons cl-item cl-list))) | |
570 (t (apply 'cl-adjoin cl-item cl-list cl-keys)))) | |
571 | |
572 (defun subst (cl-new cl-old cl-tree &rest cl-keys) | |
573 "Substitute NEW for OLD everywhere in TREE (non-destructively). | |
574 Return a copy of TREE with all elements `eql' to OLD replaced by NEW. | |
575 Keywords supported: :test :test-not :key | |
576 See `member*' for the meaning of :test, :test-not and :key." | |
577 (if (or cl-keys (and (numberp cl-old) (not (fixnump cl-old)))) | |
578 (apply 'sublis (list (cons cl-old cl-new)) cl-tree cl-keys) | |
579 (cl-do-subst cl-new cl-old cl-tree))) | |
580 | |
581 (defun cl-do-subst (cl-new cl-old cl-tree) | |
582 (cond ((eq cl-tree cl-old) cl-new) | |
583 ((consp cl-tree) | |
584 (let ((a (cl-do-subst cl-new cl-old (car cl-tree))) | |
585 (d (cl-do-subst cl-new cl-old (cdr cl-tree)))) | |
586 (if (and (eq a (car cl-tree)) (eq d (cdr cl-tree))) | |
587 cl-tree (cons a d)))) | |
588 (t cl-tree))) | |
589 | 559 |
590 (defun acons (key value alist) | 560 (defun acons (key value alist) |
591 "Return a new alist created by adding (KEY . VALUE) to ALIST." | 561 "Return a new alist created by adding (KEY . VALUE) to ALIST." |
592 (cons (cons key value) alist)) | 562 (cons (cons key value) alist)) |
593 | 563 |