Mercurial > hg > xemacs-beta
annotate lisp/cl-extra.el @ 4996:c17c857e20bf
Merge.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 03 Feb 2010 20:18:53 +0000 |
| parents | 6ef8256a020a 8431b52e43b1 |
| children | 8800b5350a13 |
| rev | line source |
|---|---|
| 613 | 1 ;;; cl-extra.el --- Common Lisp extensions for XEmacs Lisp (part two) |
| 428 | 2 |
| 2153 | 3 ;; Copyright (C) 1993,2000,2003 Free Software Foundation, Inc. |
| 801 | 4 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Author: Dave Gillespie <daveg@synaptics.com> | |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Version: 2.02 | |
| 9 ;; Keywords: extensions, dumped | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 25 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 26 ;; 02111-1307, USA. | |
| 27 | |
| 2153 | 28 ;;; Synched up with: FSF 21.3. |
| 428 | 29 |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; This file is dumped with XEmacs. | |
| 33 | |
| 34 ;; These are extensions to Emacs Lisp that provide a degree of | |
| 35 ;; Common Lisp compatibility, beyond what is already built-in | |
| 36 ;; in Emacs Lisp. | |
| 37 ;; | |
| 38 ;; This package was written by Dave Gillespie; it is a complete | |
| 39 ;; rewrite of Cesar Quiroz's original cl.el package of December 1986. | |
| 40 ;; | |
| 41 ;; Bug reports, comments, and suggestions are welcome! | |
| 42 | |
| 43 ;; This file contains portions of the Common Lisp extensions | |
| 44 ;; package which are autoloaded since they are relatively obscure. | |
| 45 | |
| 46 ;; See cl.el for Change Log. | |
| 47 | |
| 48 | |
| 49 ;;; Code: | |
| 2153 | 50 ;; XEmacs addition |
| 428 | 51 (eval-when-compile |
| 52 (require 'obsolete)) | |
| 53 | |
| 54 (or (memq 'cl-19 features) | |
| 55 (error "Tried to load `cl-extra' before `cl'!")) | |
| 56 | |
| 57 | |
| 58 ;;; Type coercion. | |
| 59 | |
| 60 (defun coerce (x type) | |
| 61 "Coerce OBJECT to type TYPE. | |
| 62 TYPE is a Common Lisp type specifier." | |
| 63 (cond ((eq type 'list) (if (listp x) x (append x nil))) | |
| 64 ((eq type 'vector) (if (vectorp x) x (vconcat x))) | |
| 65 ((eq type 'string) (if (stringp x) x (concat x))) | |
| 66 ((eq type 'array) (if (arrayp x) x (vconcat x))) | |
| 67 ((and (eq type 'character) (stringp x) (= (length x) 1)) (aref x 0)) | |
| 68 ((and (eq type 'character) (symbolp x)) (coerce (symbol-name x) type)) | |
| 2153 | 69 ;; XEmacs addition character <-> integer coercions |
| 446 | 70 ((and (eq type 'character) (char-int-p x)) (int-char x)) |
| 71 ((and (eq type 'integer) (characterp x)) (char-int x)) | |
| 428 | 72 ((eq type 'float) (float x)) |
| 2153 | 73 ;; XEmacs addition: enhanced numeric type coercions |
| 2367 | 74 ((and-fboundp 'coerce-number |
| 75 (memq type '(integer ratio bigfloat)) | |
| 76 (coerce-number x type))) | |
| 2153 | 77 ;; XEmacs addition: bit-vector coercion |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
78 ((or (eq type 'bit-vector) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
79 (eq type 'simple-bit-vector)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
80 (if (bit-vector-p x) x (apply 'bit-vector (append x nil)))) |
| 2153 | 81 ;; XEmacs addition: weak-list coercion |
| 428 | 82 ((eq type 'weak-list) |
| 83 (if (weak-list-p x) x | |
| 84 (let ((wl (make-weak-list))) | |
| 85 (set-weak-list-list wl (if (listp x) x (append x nil))) | |
| 86 wl))) | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
87 ((and |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
88 (consp type) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
89 (or (eq (car type) 'vector) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
90 (eq (car type) 'simple-array) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
91 (eq (car type) 'simple-vector)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
92 (cond |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
93 ((equal (cdr-safe type) '(*)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
94 (coerce x 'vector)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
95 ((equal (cdr-safe type) '(bit)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
96 (coerce x 'bit-vector)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
97 ((equal (cdr-safe type) '(character)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
98 (coerce x 'string))))) |
| 428 | 99 ((typep x type) x) |
| 100 (t (error "Can't coerce %s to type %s" x type)))) | |
| 101 | |
| 102 | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
103 ;;;;; Predicates. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
104 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
105 ;;;; I'd actually prefer not to have this inline, the space |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
106 ;;;; vs. amount-it's-called trade-off isn't reasonable, but that would |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
107 ;;;; introduce bytecode problems with the compiler macro in cl-macs.el. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
108 ;;(defsubst cl-string-vector-equalp (cl-string cl-vector) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
109 ;; "Helper function for `equalp', which see." |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
110 ;;; (check-argument-type #'stringp cl-string) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
111 ;;; (check-argument-type #'vector cl-vector) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
112 ;; (let ((cl-i (length cl-string)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
113 ;; cl-char cl-other) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
114 ;; (when (= cl-i (length cl-vector)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
115 ;; (while (and (>= (setq cl-i (1- cl-i)) 0) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
116 ;; (or (eq (setq cl-char (aref cl-string cl-i)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
117 ;; (setq cl-other (aref cl-vector cl-i))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
118 ;; (and (characterp cl-other) ; Note we want to call this |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
119 ;; ; as rarely as possible, it |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
120 ;; ; doesn't have a bytecode. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
121 ;; (eq (downcase cl-char) (downcase cl-other)))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
122 ;; (< cl-i 0)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
123 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
124 ;;;; See comment on cl-string-vector-equalp above. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
125 ;;(defsubst cl-bit-vector-vector-equalp (cl-bit-vector cl-vector) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
126 ;; "Helper function for `equalp', which see." |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
127 ;;; (check-argument-type #'bit-vector-p cl-bit-vector) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
128 ;;; (check-argument-type #'vectorp cl-vector) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
129 ;; (let ((cl-i (length cl-bit-vector)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
130 ;; cl-other) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
131 ;; (when (= cl-i (length cl-vector)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
132 ;; (while (and (>= (setq cl-i (1- cl-i)) 0) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
133 ;; (numberp (setq cl-other (aref cl-vector cl-i))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
134 ;; ;; Differs from clisp here. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
135 ;; (= (aref cl-bit-vector cl-i) cl-other))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
136 ;; (< cl-i 0)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
137 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
138 ;;;; These two helper functions call equalp recursively, the two above have no |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
139 ;;;; need to. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
140 ;;(defsubst cl-vector-array-equalp (cl-vector cl-array) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
141 ;; "Helper function for `equalp', which see." |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
142 ;;; (check-argument-type #'vector cl-vector) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
143 ;;; (check-argument-type #'arrayp cl-array) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
144 ;; (let ((cl-i (length cl-vector))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
145 ;; (when (= cl-i (length cl-array)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
146 ;; (while (and (>= (setq cl-i (1- cl-i)) 0) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
147 ;; (equalp (aref cl-vector cl-i) (aref cl-array cl-i)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
148 ;; (< cl-i 0)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
149 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
150 ;;(defsubst cl-hash-table-contents-equalp (cl-hash-table-1 cl-hash-table-2) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
151 ;; "Helper function for `equalp', which see." |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
152 ;; (symbol-macrolet |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
153 ;; ;; If someone has gone and fished the uninterned symbol out of this |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
154 ;; ;; function's constants vector, and subsequently stored it as a value |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
155 ;; ;; in a hash table, it's their own damn fault when |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
156 ;; ;; `cl-hash-table-contents-equalp' gives the wrong answer. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
157 ;; ((equalp-default '#:equalp-default)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
158 ;; (loop |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
159 ;; for x-key being the hash-key in cl-hash-table-1 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
160 ;; using (hash-value x-value) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
161 ;; with y-value = nil |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
162 ;; always (and (not (eq equalp-default |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
163 ;; (setq y-value (gethash x-key cl-hash-table-2 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
164 ;; equalp-default)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
165 ;; (equalp y-value x-value))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
166 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
167 ;;(defun equalp (x y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
168 ;; "Return t if two Lisp objects have similar structures and contents. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
169 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
170 ;;This is like `equal', except that it accepts numerically equal |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
171 ;;numbers of different types (float, integer, bignum, bigfloat), and also |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
172 ;;compares strings and characters case-insensitively. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
173 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
174 ;;Arrays (that is, strings, bit-vectors, and vectors) of the same length and |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
175 ;;with contents that are `equalp' are themselves `equalp'. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
176 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
177 ;;Two hash tables are `equalp' if they have the same test (see |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
178 ;;`hash-table-test'), if they have the same number of entries, and if, for |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
179 ;;each entry in one hash table, its key is equivalent to a key in the other |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
180 ;;hash table using the hash table test, and its value is `equalp' to the other |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
181 ;;hash table's value for that key." |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
182 ;; (cond ((eq x y)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
183 ;; ((stringp x) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
184 ;; (if (stringp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
185 ;; (eq t (compare-strings x nil nil y nil nil t)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
186 ;; (if (vectorp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
187 ;; (cl-string-vector-equalp x y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
188 ;; ;; bit-vectors and strings are only equalp if they're |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
189 ;; ;; zero-length: |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
190 ;; (and (equal "" x) (equal #* y))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
191 ;; ((numberp x) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
192 ;; (and (numberp y) (= x y))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
193 ;; ((consp x) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
194 ;; (while (and (consp x) (consp y) (equalp (car x) (car y))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
195 ;; (setq x (cdr x) y (cdr y))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
196 ;; (and (not (consp x)) (equalp x y))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
197 ;; (t |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
198 ;; ;; From here on, the type tests don't (yet) have bytecodes. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
199 ;; (let ((x-type (type-of x))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
200 ;; (cond ((eq 'vector x-type) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
201 ;; (if (stringp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
202 ;; (cl-string-vector-equalp y x) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
203 ;; (if (vectorp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
204 ;; (cl-vector-array-equalp x y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
205 ;; (if (bit-vector-p y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
206 ;; (cl-bit-vector-vector-equalp y x))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
207 ;; ((eq 'character x-type) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
208 ;; (and (characterp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
209 ;; ;; If the characters are actually identical, the |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
210 ;; ;; first eq test will have caught them above; we only |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
211 ;; ;; need to check them case-insensitively here. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
212 ;; (eq (downcase x) (downcase y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
213 ;; ((eq 'hash-table x-type) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
214 ;; (and (hash-table-p y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
215 ;; (eq (hash-table-test x) (hash-table-test y)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
216 ;; (= (hash-table-count x) (hash-table-count y)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
217 ;; (cl-hash-table-contents-equalp x y))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
218 ;; ((eq 'bit-vector x-type) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
219 ;; (if (bit-vector-p y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
220 ;; (equal x y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
221 ;; (if (vectorp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
222 ;; (cl-bit-vector-vector-equalp x y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
223 ;; ;; bit-vectors and strings are only equalp if they're |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
224 ;; ;; zero-length: |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
225 ;; (and (equal "" y) (equal #* x))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4800
diff
changeset
|
226 ;; (t (equal x y))))))) |
| 428 | 227 |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
228 ;; XEmacs; #'map, #'mapc, #'mapl, #'maplist, #'mapcon are now in C, together |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4800
diff
changeset
|
229 ;; with #'map-into, which was never in this file. |
| 428 | 230 |
| 231 (defun some (cl-pred cl-seq &rest cl-rest) | |
| 232 "Return true if PREDICATE is true of any element of SEQ or SEQs. | |
| 233 If so, return the true (non-nil) value returned by PREDICATE." | |
| 234 (if (or cl-rest (nlistp cl-seq)) | |
| 235 (catch 'cl-some | |
| 236 (apply 'map nil | |
| 237 (function (lambda (&rest cl-x) | |
| 238 (let ((cl-res (apply cl-pred cl-x))) | |
| 239 (if cl-res (throw 'cl-some cl-res))))) | |
| 240 cl-seq cl-rest) nil) | |
| 241 (let ((cl-x nil)) | |
| 2153 | 242 (while (and cl-seq (not (setq cl-x (funcall cl-pred (pop cl-seq)))))) |
| 428 | 243 cl-x))) |
| 244 | |
| 245 (defun every (cl-pred cl-seq &rest cl-rest) | |
| 246 "Return true if PREDICATE is true of every element of SEQ or SEQs." | |
| 247 (if (or cl-rest (nlistp cl-seq)) | |
| 248 (catch 'cl-every | |
| 249 (apply 'map nil | |
| 250 (function (lambda (&rest cl-x) | |
| 251 (or (apply cl-pred cl-x) (throw 'cl-every nil)))) | |
| 252 cl-seq cl-rest) t) | |
| 253 (while (and cl-seq (funcall cl-pred (car cl-seq))) | |
| 254 (setq cl-seq (cdr cl-seq))) | |
| 255 (null cl-seq))) | |
| 256 | |
| 257 (defun notany (cl-pred cl-seq &rest cl-rest) | |
| 258 "Return true if PREDICATE is false of every element of SEQ or SEQs." | |
| 259 (not (apply 'some cl-pred cl-seq cl-rest))) | |
| 260 | |
| 261 (defun notevery (cl-pred cl-seq &rest cl-rest) | |
| 262 "Return true if PREDICATE is false of some element of SEQ or SEQs." | |
| 263 (not (apply 'every cl-pred cl-seq cl-rest))) | |
| 264 | |
| 265 ;;; Support for `loop'. | |
| 2153 | 266 (defalias 'cl-map-keymap 'map-keymap) |
| 428 | 267 |
| 268 (defun cl-map-keymap-recursively (cl-func-rec cl-map &optional cl-base) | |
| 269 (or cl-base | |
| 2153 | 270 (setq cl-base (copy-sequence [0]))) |
| 271 (map-keymap | |
| 428 | 272 (function |
| 273 (lambda (cl-key cl-bind) | |
| 274 (aset cl-base (1- (length cl-base)) cl-key) | |
| 275 (if (keymapp cl-bind) | |
| 276 (cl-map-keymap-recursively | |
| 277 cl-func-rec cl-bind | |
| 2153 | 278 (vconcat cl-base (list 0))) |
| 428 | 279 (funcall cl-func-rec cl-base cl-bind)))) |
| 280 cl-map)) | |
| 281 | |
| 282 (defun cl-map-intervals (cl-func &optional cl-what cl-prop cl-start cl-end) | |
| 283 (or cl-what (setq cl-what (current-buffer))) | |
| 284 (if (bufferp cl-what) | |
| 285 (let (cl-mark cl-mark2 (cl-next t) cl-next2) | |
| 2153 | 286 (with-current-buffer cl-what |
| 428 | 287 (setq cl-mark (copy-marker (or cl-start (point-min)))) |
| 288 (setq cl-mark2 (and cl-end (copy-marker cl-end)))) | |
| 289 (while (and cl-next (or (not cl-mark2) (< cl-mark cl-mark2))) | |
| 2153 | 290 (setq cl-next (if cl-prop (next-single-property-change |
| 291 cl-mark cl-prop cl-what) | |
| 292 (next-property-change cl-mark cl-what)) | |
| 293 cl-next2 (or cl-next (with-current-buffer cl-what | |
| 294 (point-max)))) | |
| 428 | 295 (funcall cl-func (prog1 (marker-position cl-mark) |
| 296 (set-marker cl-mark cl-next2)) | |
| 297 (if cl-mark2 (min cl-next2 cl-mark2) cl-next2))) | |
| 298 (set-marker cl-mark nil) (if cl-mark2 (set-marker cl-mark2 nil))) | |
| 299 (or cl-start (setq cl-start 0)) | |
| 300 (or cl-end (setq cl-end (length cl-what))) | |
| 301 (while (< cl-start cl-end) | |
| 2153 | 302 (let ((cl-next (or (if cl-prop (next-single-property-change |
| 303 cl-start cl-prop cl-what) | |
| 304 (next-property-change cl-start cl-what)) | |
| 428 | 305 cl-end))) |
| 306 (funcall cl-func cl-start (min cl-next cl-end)) | |
| 307 (setq cl-start cl-next))))) | |
| 308 | |
| 309 (defun cl-map-overlays (cl-func &optional cl-buffer cl-start cl-end cl-arg) | |
| 310 (or cl-buffer (setq cl-buffer (current-buffer))) | |
| 502 | 311 (with-fboundp '(overlay-start overlay-end overlays-at next-overlay-change) |
| 312 (if-fboundp 'overlay-lists | |
| 428 | 313 |
| 502 | 314 ;; This is the preferred algorithm, though overlay-lists is |
| 315 ;; undocumented. | |
| 316 (let (cl-ovl) | |
| 2153 | 317 (with-current-buffer cl-buffer |
| 502 | 318 (setq cl-ovl (overlay-lists)) |
| 319 (if cl-start (setq cl-start (copy-marker cl-start))) | |
| 320 (if cl-end (setq cl-end (copy-marker cl-end)))) | |
| 321 (setq cl-ovl (nconc (car cl-ovl) (cdr cl-ovl))) | |
| 322 (while (and cl-ovl | |
| 323 (or (not (overlay-start (car cl-ovl))) | |
| 324 (and cl-end (>= (overlay-start (car cl-ovl)) cl-end)) | |
| 325 (and cl-start (<= (overlay-end (car cl-ovl)) | |
| 326 cl-start)) | |
| 327 (not (funcall cl-func (car cl-ovl) cl-arg)))) | |
| 328 (setq cl-ovl (cdr cl-ovl))) | |
| 329 (if cl-start (set-marker cl-start nil)) | |
| 330 (if cl-end (set-marker cl-end nil))) | |
| 331 | |
| 332 ;; This alternate algorithm fails to find zero-length overlays. | |
| 2153 | 333 (let ((cl-mark (with-current-buffer cl-buffer |
| 334 (copy-marker (or cl-start (point-min))))) | |
| 335 (cl-mark2 (and cl-end (with-current-buffer cl-buffer | |
| 336 (copy-marker cl-end)))) | |
| 502 | 337 cl-pos cl-ovl) |
| 338 (while (save-excursion | |
| 339 (and (setq cl-pos (marker-position cl-mark)) | |
| 340 (< cl-pos (or cl-mark2 (point-max))) | |
| 341 (progn | |
| 342 (set-buffer cl-buffer) | |
| 343 (setq cl-ovl (overlays-at cl-pos)) | |
| 344 (set-marker cl-mark (next-overlay-change cl-pos))))) | |
| 345 (while (and cl-ovl | |
| 346 (or (/= (overlay-start (car cl-ovl)) cl-pos) | |
| 347 (not (and (funcall cl-func (car cl-ovl) cl-arg) | |
| 348 (set-marker cl-mark nil))))) | |
| 349 (setq cl-ovl (cdr cl-ovl)))) | |
| 350 (set-marker cl-mark nil) (if cl-mark2 (set-marker cl-mark2 nil)))))) | |
| 428 | 351 |
| 352 ;;; Support for `setf'. | |
| 353 (defun cl-set-frame-visible-p (frame val) | |
| 354 (cond ((null val) (make-frame-invisible frame)) | |
| 355 ((eq val 'icon) (iconify-frame frame)) | |
| 356 (t (make-frame-visible frame))) | |
| 357 val) | |
| 358 | |
| 359 ;;; Support for `progv'. | |
| 360 (defvar cl-progv-save) | |
| 361 (defun cl-progv-before (syms values) | |
| 362 (while syms | |
| 2153 | 363 (push (if (boundp (car syms)) |
| 428 | 364 (cons (car syms) (symbol-value (car syms))) |
| 365 (car syms)) cl-progv-save) | |
| 366 (if values | |
| 2153 | 367 (set (pop syms) (pop values)) |
| 368 (makunbound (pop syms))))) | |
| 428 | 369 |
| 370 (defun cl-progv-after () | |
| 371 (while cl-progv-save | |
| 372 (if (consp (car cl-progv-save)) | |
| 373 (set (car (car cl-progv-save)) (cdr (car cl-progv-save))) | |
| 374 (makunbound (car cl-progv-save))) | |
| 2153 | 375 (pop cl-progv-save))) |
| 428 | 376 |
| 377 | |
| 378 ;;; Numbers. | |
| 379 | |
| 380 (defun gcd (&rest args) | |
| 381 "Return the greatest common divisor of the arguments." | |
| 2153 | 382 (let ((a (abs (or (pop args) 0)))) |
| 428 | 383 (while args |
| 2153 | 384 (let ((b (abs (pop args)))) |
| 428 | 385 (while (> b 0) (setq b (% a (setq a b)))))) |
| 386 a)) | |
| 387 | |
| 388 (defun lcm (&rest args) | |
| 389 "Return the least common multiple of the arguments." | |
| 390 (if (memq 0 args) | |
| 391 0 | |
| 2153 | 392 (let ((a (abs (or (pop args) 1)))) |
| 428 | 393 (while args |
| 2153 | 394 (let ((b (abs (pop args)))) |
| 428 | 395 (setq a (* (/ a (gcd a b)) b)))) |
| 396 a))) | |
| 397 | |
| 398 (defun isqrt (a) | |
| 399 "Return the integer square root of the argument." | |
| 400 (if (and (integerp a) (> a 0)) | |
| 401 ;; XEmacs change | |
| 402 (let ((g (cond ((>= a 1000000) 10000) ((>= a 10000) 1000) | |
| 403 ((>= a 100) 100) (t 10))) | |
| 404 g2) | |
| 405 (while (< (setq g2 (/ (+ g (/ a g)) 2)) g) | |
| 406 (setq g g2)) | |
| 407 g) | |
| 408 (if (eq a 0) 0 (signal 'arith-error nil)))) | |
| 409 | |
| 2153 | 410 ;; XEmacs addition |
| 428 | 411 (defun cl-expt (x y) |
| 412 "Return X raised to the power of Y. Works only for integer arguments." | |
| 413 (if (<= y 0) (if (= y 0) 1 (if (memq x '(-1 1)) (cl-expt x (- y)) 0)) | |
| 414 (* (if (= (% y 2) 0) 1 x) (cl-expt (* x x) (/ y 2))))) | |
| 415 (or (and (fboundp 'expt) (subrp (symbol-function 'expt))) | |
| 416 (defalias 'expt 'cl-expt)) | |
| 417 | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
418 ;; We can't use macrolet in this file; whence the literal macro |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
419 ;; definition-and-call: |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
420 ((macro . (lambda (&rest symbols) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
421 "Make some old CL package truncate and round functions available. |
| 428 | 422 |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
423 These functions are now implemented in C; their Lisp implementations in this |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
424 XEmacs are trivial, so we provide them and mark them obsolete." |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
425 (let (symbol result) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
426 (while symbols |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
427 (setq symbol (car symbols) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
428 symbols (cdr symbols)) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
429 (push `(make-obsolete ',(intern (format "%s*" symbol)) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
430 ',symbol "21.5.29") |
|
4800
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
431 result) |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
432 (push |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
433 `(defun ,(intern (format "%s*" symbol)) (number &optional divisor) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
434 ,(format "See `%s'. This returns a list, not multiple values." |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
435 symbol) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
436 (multiple-value-list (,symbol number divisor))) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
437 result)) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
438 (cons 'progn result)))) |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
439 ceiling floor round truncate) |
| 428 | 440 |
| 441 (defun mod* (x y) | |
| 442 "The remainder of X divided by Y, with the same sign as Y." | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
443 (nth-value 1 (floor x y))) |
| 428 | 444 |
| 445 (defun rem* (x y) | |
| 446 "The remainder of X divided by Y, with the same sign as X." | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
447 (nth-value 1 (truncate x y))) |
| 428 | 448 |
| 449 (defun signum (a) | |
| 450 "Return 1 if A is positive, -1 if negative, 0 if zero." | |
| 451 (cond ((> a 0) 1) ((< a 0) -1) (t 0))) | |
| 452 | |
| 453 ;; Random numbers. | |
| 454 | |
| 455 (defvar *random-state*) | |
| 456 (defun random* (lim &optional state) | |
| 457 "Return a random nonnegative number less than LIM, an integer or float. | |
| 458 Optional second arg STATE is a random-state object." | |
| 459 (or state (setq state *random-state*)) | |
| 460 ;; Inspired by "ran3" from Numerical Recipes. Additive congruential method. | |
| 461 (let ((vec (aref state 3))) | |
| 462 (if (integerp vec) | |
| 463 (let ((i 0) (j (- 1357335 (% (abs vec) 1357333))) (k 1)) | |
| 464 (aset state 3 (setq vec (make-vector 55 nil))) | |
| 465 (aset vec 0 j) | |
| 466 (while (> (setq i (% (+ i 21) 55)) 0) | |
| 467 (aset vec i (setq j (prog1 k (setq k (- j k)))))) | |
| 468 (while (< (setq i (1+ i)) 200) (random* 2 state)))) | |
| 469 (let* ((i (aset state 1 (% (1+ (aref state 1)) 55))) | |
| 470 (j (aset state 2 (% (1+ (aref state 2)) 55))) | |
| 471 (n (logand 8388607 (aset vec i (- (aref vec i) (aref vec j)))))) | |
| 472 (if (integerp lim) | |
| 473 (if (<= lim 512) (% n lim) | |
| 474 (if (> lim 8388607) (setq n (+ (lsh n 9) (random* 512 state)))) | |
| 475 (let ((mask 1023)) | |
| 476 (while (< mask (1- lim)) (setq mask (1+ (+ mask mask)))) | |
| 477 (if (< (setq n (logand n mask)) lim) n (random* lim state)))) | |
| 478 (* (/ n '8388608e0) lim))))) | |
| 479 | |
| 480 (defun make-random-state (&optional state) | |
| 481 "Return a copy of random-state STATE, or of `*random-state*' if omitted. | |
| 482 If STATE is t, return a new state object seeded from the time of day." | |
| 483 (cond ((null state) (make-random-state *random-state*)) | |
| 484 ((vectorp state) (cl-copy-tree state t)) | |
| 485 ((integerp state) (vector 'cl-random-state-tag -1 30 state)) | |
| 486 (t (make-random-state (cl-random-time))))) | |
| 487 | |
| 488 (defun random-state-p (object) | |
| 489 "Return t if OBJECT is a random-state object." | |
| 490 (and (vectorp object) (= (length object) 4) | |
| 491 (eq (aref object 0) 'cl-random-state-tag))) | |
| 492 | |
| 493 | |
| 494 ;; Implementation limits. | |
| 495 | |
| 496 (defun cl-finite-do (func a b) | |
| 497 (condition-case nil | |
| 498 (let ((res (funcall func a b))) ; check for IEEE infinity | |
| 499 (and (numberp res) (/= res (/ res 2)) res)) | |
| 500 (arith-error nil))) | |
| 501 | |
| 502 (defvar most-positive-float) | |
| 503 (defvar most-negative-float) | |
| 504 (defvar least-positive-float) | |
| 505 (defvar least-negative-float) | |
| 506 (defvar least-positive-normalized-float) | |
| 507 (defvar least-negative-normalized-float) | |
| 508 (defvar float-epsilon) | |
| 509 (defvar float-negative-epsilon) | |
| 510 | |
| 511 (defun cl-float-limits () | |
| 512 (or most-positive-float (not (numberp '2e1)) | |
| 513 (let ((x '2e0) y z) | |
| 514 ;; Find maximum exponent (first two loops are optimizations) | |
| 515 (while (cl-finite-do '* x x) (setq x (* x x))) | |
| 516 (while (cl-finite-do '* x (/ x 2)) (setq x (* x (/ x 2)))) | |
| 517 (while (cl-finite-do '+ x x) (setq x (+ x x))) | |
| 518 (setq z x y (/ x 2)) | |
| 519 ;; Now fill in 1's in the mantissa. | |
| 520 (while (and (cl-finite-do '+ x y) (/= (+ x y) x)) | |
| 521 (setq x (+ x y) y (/ y 2))) | |
| 522 (setq most-positive-float x | |
| 523 most-negative-float (- x)) | |
| 524 ;; Divide down until mantissa starts rounding. | |
| 525 (setq x (/ x z) y (/ 16 z) x (* x y)) | |
| 526 (while (condition-case nil (and (= x (* (/ x 2) 2)) (> (/ y 2) 0)) | |
| 527 (arith-error nil)) | |
| 528 (setq x (/ x 2) y (/ y 2))) | |
| 529 (setq least-positive-normalized-float y | |
| 530 least-negative-normalized-float (- y)) | |
| 531 ;; Divide down until value underflows to zero. | |
| 532 (setq x (/ 1 z) y x) | |
| 533 (while (condition-case nil (> (/ x 2) 0) (arith-error nil)) | |
| 534 (setq x (/ x 2))) | |
| 535 (setq least-positive-float x | |
| 536 least-negative-float (- x)) | |
| 537 (setq x '1e0) | |
| 538 (while (/= (+ '1e0 x) '1e0) (setq x (/ x 2))) | |
| 539 (setq float-epsilon (* x 2)) | |
| 540 (setq x '1e0) | |
| 541 (while (/= (- '1e0 x) '1e0) (setq x (/ x 2))) | |
| 542 (setq float-negative-epsilon (* x 2)))) | |
| 543 nil) | |
| 544 | |
| 545 | |
| 546 ;;; Sequence functions. | |
| 547 | |
| 548 ;XEmacs -- our built-in is more powerful. | |
| 549 ;(defun subseq (seq start &optional end) | |
| 550 ; "Return the subsequence of SEQ from START to END. | |
| 551 ;If END is omitted, it defaults to the length of the sequence. | |
| 552 ;If START or END is negative, it counts from the end." | |
| 553 ; (if (stringp seq) (substring seq start end) | |
| 554 ; (let (len) | |
| 555 ; (and end (< end 0) (setq end (+ end (setq len (length seq))))) | |
| 556 ; (if (< start 0) (setq start (+ start (or len (setq len (length seq)))))) | |
| 557 ; (cond ((listp seq) | |
| 558 ; (if (> start 0) (setq seq (nthcdr start seq))) | |
| 559 ; (if end | |
| 560 ; (let ((res nil)) | |
| 561 ; (while (>= (setq end (1- end)) start) | |
| 2153 | 562 ; (push (pop seq) res)) |
| 428 | 563 ; (nreverse res)) |
| 564 ; (copy-sequence seq))) | |
| 565 ; (t | |
| 566 ; (or end (setq end (or len (length seq)))) | |
| 567 ; (let ((res (make-vector (max (- end start) 0) nil)) | |
| 568 ; (i 0)) | |
| 569 ; (while (< start end) | |
| 570 ; (aset res i (aref seq start)) | |
| 571 ; (setq i (1+ i) start (1+ start))) | |
| 572 ; res)))))) | |
| 573 | |
| 574 (defun concatenate (type &rest seqs) | |
| 575 "Concatenate, into a sequence of type TYPE, the argument SEQUENCES." | |
| 2153 | 576 ;; XEmacs change: use case instead of cond for clarity |
| 428 | 577 (case type |
| 578 (vector (apply 'vconcat seqs)) | |
| 579 (string (apply 'concat seqs)) | |
| 580 (list (apply 'append (append seqs '(nil)))) | |
| 581 (t (error "Not a sequence type name: %s" type)))) | |
| 582 | |
| 583 ;;; List functions. | |
| 584 | |
| 585 (defun revappend (x y) | |
| 586 "Equivalent to (append (reverse X) Y)." | |
| 587 (nconc (reverse x) y)) | |
| 588 | |
| 589 (defun nreconc (x y) | |
| 590 "Equivalent to (nconc (nreverse X) Y)." | |
| 591 (nconc (nreverse x) y)) | |
| 592 | |
| 593 (defun list-length (x) | |
| 594 "Return the length of a list. Return nil if list is circular." | |
| 595 (let ((n 0) (fast x) (slow x)) | |
| 596 (while (and (cdr fast) (not (and (eq fast slow) (> n 0)))) | |
| 597 (setq n (+ n 2) fast (cdr (cdr fast)) slow (cdr slow))) | |
| 598 (if fast (if (cdr fast) nil (1+ n)) n))) | |
| 599 | |
| 600 (defun tailp (sublist list) | |
| 601 "Return true if SUBLIST is a tail of LIST." | |
| 602 (while (and (consp list) (not (eq sublist list))) | |
| 603 (setq list (cdr list))) | |
| 604 (if (numberp sublist) (equal sublist list) (eq sublist list))) | |
| 605 | |
| 2153 | 606 (defalias 'cl-copy-tree 'copy-tree) |
| 428 | 607 |
| 608 | |
| 609 ;;; Property lists. | |
| 610 | |
| 611 ;; XEmacs: our `get' groks DEFAULT. | |
| 612 (defalias 'get* 'get) | |
| 442 | 613 (defalias 'getf 'plist-get) |
| 428 | 614 |
| 615 (defun cl-set-getf (plist tag val) | |
| 616 (let ((p plist)) | |
| 617 (while (and p (not (eq (car p) tag))) (setq p (cdr (cdr p)))) | |
| 618 (if p (progn (setcar (cdr p) val) plist) (list* tag val plist)))) | |
| 619 | |
| 620 (defun cl-do-remf (plist tag) | |
| 621 (let ((p (cdr plist))) | |
| 622 (while (and (cdr p) (not (eq (car (cdr p)) tag))) (setq p (cdr (cdr p)))) | |
| 623 (and (cdr p) (progn (setcdr p (cdr (cdr (cdr p)))) t)))) | |
| 624 | |
| 2153 | 625 ;; XEmacs change: we have a builtin remprop |
| 626 (defalias 'cl-remprop 'remprop) | |
| 627 | |
|
4800
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
628 (defun get-properties (plist indicator-list) |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
629 "Find a property from INDICATOR-LIST in PLIST. |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
630 Return 3 values: |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
631 - the first property found, |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
632 - its value, |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
633 - the tail of PLIST beginning with the found entry." |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
634 (do ((plst plist (cddr plst))) |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
635 ((null plst) (values nil nil nil)) |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
636 (cond ((atom (cdr plst)) |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
637 (error "Malformed property list: %S." plist)) |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
638 ((memq (car plst) indicator-list) |
|
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
639 (return (values (car plst) (cadr plst) plst)))))) |
| 2153 | 640 |
| 641 | |
| 428 | 642 ;;; Hash tables. |
| 643 | |
| 644 ;; The `regular' Common Lisp hash-table stuff has been moved into C. | |
| 645 ;; Only backward compatibility stuff remains here. | |
| 646 (defun make-hashtable (size &optional test) | |
| 647 (make-hash-table :test test :size size)) | |
| 648 (defun make-weak-hashtable (size &optional test) | |
| 649 (make-hash-table :test test :size size :weakness t)) | |
| 650 (defun make-key-weak-hashtable (size &optional test) | |
| 651 (make-hash-table :test test :size size :weakness 'key)) | |
| 652 (defun make-value-weak-hashtable (size &optional test) | |
| 653 (make-hash-table :test test :size size :weakness 'value)) | |
| 654 | |
| 655 (define-obsolete-function-alias 'hashtablep 'hash-table-p) | |
| 656 (define-obsolete-function-alias 'hashtable-fullness 'hash-table-count) | |
| 657 (define-obsolete-function-alias 'hashtable-test-function 'hash-table-test) | |
| 658 (define-obsolete-function-alias 'hashtable-type 'hash-table-type) | |
| 659 (define-obsolete-function-alias 'hashtable-size 'hash-table-size) | |
| 660 (define-obsolete-function-alias 'copy-hashtable 'copy-hash-table) | |
| 661 | |
| 662 (make-obsolete 'make-hashtable 'make-hash-table) | |
| 663 (make-obsolete 'make-weak-hashtable 'make-hash-table) | |
| 664 (make-obsolete 'make-key-weak-hashtable 'make-hash-table) | |
| 665 (make-obsolete 'make-value-weak-hashtable 'make-hash-table) | |
| 666 (make-obsolete 'hash-table-type 'hash-table-weakness) | |
| 667 | |
| 668 (when (fboundp 'x-keysym-hash-table) | |
| 669 (make-obsolete 'x-keysym-hashtable 'x-keysym-hash-table)) | |
| 670 | |
| 671 ;; Compatibility stuff for old kludgy cl.el hash table implementation | |
| 672 (defvar cl-builtin-gethash (symbol-function 'gethash)) | |
| 673 (defvar cl-builtin-remhash (symbol-function 'remhash)) | |
| 674 (defvar cl-builtin-clrhash (symbol-function 'clrhash)) | |
| 675 (defvar cl-builtin-maphash (symbol-function 'maphash)) | |
| 676 | |
| 677 (defalias 'cl-gethash 'gethash) | |
| 678 (defalias 'cl-puthash 'puthash) | |
| 679 (defalias 'cl-remhash 'remhash) | |
| 680 (defalias 'cl-clrhash 'clrhash) | |
| 681 (defalias 'cl-maphash 'maphash) | |
| 2153 | 682 ;; These three actually didn't exist in Emacs-20. |
| 683 (defalias 'cl-make-hash-table 'make-hash-table) | |
| 684 (defalias 'cl-hash-table-p 'hash-table-p) | |
| 685 (defalias 'cl-hash-table-count 'hash-table-count) | |
| 428 | 686 |
| 687 ;;; Some debugging aids. | |
| 688 | |
| 689 (defun cl-prettyprint (form) | |
| 690 "Insert a pretty-printed rendition of a Lisp FORM in current buffer." | |
| 691 (let ((pt (point)) last) | |
| 692 (insert "\n" (prin1-to-string form) "\n") | |
| 693 (setq last (point)) | |
| 694 (goto-char (1+ pt)) | |
| 695 (while (search-forward "(quote " last t) | |
| 696 (delete-backward-char 7) | |
| 697 (insert "'") | |
| 698 (forward-sexp) | |
| 699 (delete-char 1)) | |
| 700 (goto-char (1+ pt)) | |
| 701 (cl-do-prettyprint))) | |
| 702 | |
| 703 (defun cl-do-prettyprint () | |
| 704 (skip-chars-forward " ") | |
| 705 (if (looking-at "(") | |
|
4800
b828e06dbe38
New (Common Lisp) function get-propertie
Didier Verna <didier@xemacs.org>
parents:
4792
diff
changeset
|
706 (let ((skip (or (looking-at "((") |
| 2153 | 707 ;; XEmacs: be selective about trailing stuff after prog |
| 1729 | 708 (looking-at "(prog[nv12\\(ress-feedback\\|n-with-message\\)]") |
| 428 | 709 (looking-at "(unwind-protect ") |
| 710 (looking-at "(function (") | |
| 711 (looking-at "(cl-block-wrapper "))) | |
| 712 (two (or (looking-at "(defun ") (looking-at "(defmacro "))) | |
| 713 (let (or (looking-at "(let\\*? ") (looking-at "(while "))) | |
| 714 (set (looking-at "(p?set[qf] "))) | |
| 715 (if (or skip let | |
| 716 (progn | |
| 717 (forward-sexp) | |
| 718 (and (>= (current-column) 78) (progn (backward-sexp) t)))) | |
| 719 (let ((nl t)) | |
| 720 (forward-char 1) | |
| 721 (cl-do-prettyprint) | |
| 722 (or skip (looking-at ")") (cl-do-prettyprint)) | |
| 723 (or (not two) (looking-at ")") (cl-do-prettyprint)) | |
| 724 (while (not (looking-at ")")) | |
| 725 (if set (setq nl (not nl))) | |
| 726 (if nl (insert "\n")) | |
| 727 (lisp-indent-line) | |
| 728 (cl-do-prettyprint)) | |
| 729 (forward-char 1)))) | |
| 730 (forward-sexp))) | |
| 731 | |
| 732 (defvar cl-macroexpand-cmacs nil) | |
| 733 (defvar cl-closure-vars nil) | |
| 734 | |
| 735 (defun cl-macroexpand-all (form &optional env) | |
| 736 "Expand all macro calls through a Lisp FORM. | |
| 737 This also does some trivial optimizations to make the form prettier." | |
| 738 (while (or (not (eq form (setq form (macroexpand form env)))) | |
| 739 (and cl-macroexpand-cmacs | |
| 740 (not (eq form (setq form (compiler-macroexpand form))))))) | |
| 741 (cond ((not (consp form)) form) | |
| 742 ((memq (car form) '(let let*)) | |
| 743 (if (null (nth 1 form)) | |
| 744 (cl-macroexpand-all (cons 'progn (cddr form)) env) | |
| 745 (let ((letf nil) (res nil) (lets (cadr form))) | |
| 746 (while lets | |
| 2153 | 747 (push (if (consp (car lets)) |
| 428 | 748 (let ((exp (cl-macroexpand-all (caar lets) env))) |
| 749 (or (symbolp exp) (setq letf t)) | |
| 750 (cons exp (cl-macroexpand-body (cdar lets) env))) | |
| 751 (let ((exp (cl-macroexpand-all (car lets) env))) | |
| 752 (if (symbolp exp) exp | |
| 753 (setq letf t) (list exp nil)))) res) | |
| 754 (setq lets (cdr lets))) | |
| 755 (list* (if letf (if (eq (car form) 'let) 'letf 'letf*) (car form)) | |
| 756 (nreverse res) (cl-macroexpand-body (cddr form) env))))) | |
| 757 ((eq (car form) 'cond) | |
| 758 (cons (car form) | |
| 759 (mapcar (function (lambda (x) (cl-macroexpand-body x env))) | |
| 760 (cdr form)))) | |
| 761 ((eq (car form) 'condition-case) | |
| 762 (list* (car form) (nth 1 form) (cl-macroexpand-all (nth 2 form) env) | |
| 763 (mapcar (function | |
| 764 (lambda (x) | |
| 765 (cons (car x) (cl-macroexpand-body (cdr x) env)))) | |
| 766 (cdddr form)))) | |
| 767 ((memq (car form) '(quote function)) | |
| 768 (if (eq (car-safe (nth 1 form)) 'lambda) | |
| 769 (let ((body (cl-macroexpand-body (cddadr form) env))) | |
| 770 (if (and cl-closure-vars (eq (car form) 'function) | |
| 771 (cl-expr-contains-any body cl-closure-vars)) | |
| 772 (let* ((new (mapcar 'gensym cl-closure-vars)) | |
| 773 (sub (pairlis cl-closure-vars new)) (decls nil)) | |
| 774 (while (or (stringp (car body)) | |
| 775 (eq (car-safe (car body)) 'interactive)) | |
| 2153 | 776 (push (list 'quote (pop body)) decls)) |
| 428 | 777 (put (car (last cl-closure-vars)) 'used t) |
| 778 (append | |
| 779 (list 'list '(quote lambda) '(quote (&rest --cl-rest--))) | |
| 780 (sublis sub (nreverse decls)) | |
| 781 (list | |
| 782 (list* 'list '(quote apply) | |
| 2153 | 783 ;; XEmacs: put a quote before the function |
| 428 | 784 (list 'list '(quote quote) |
| 785 (list 'function | |
| 786 (list* 'lambda | |
| 787 (append new (cadadr form)) | |
| 788 (sublis sub body)))) | |
| 789 (nconc (mapcar (function | |
| 790 (lambda (x) | |
| 791 (list 'list '(quote quote) x))) | |
| 792 cl-closure-vars) | |
| 793 '((quote --cl-rest--))))))) | |
| 794 (list (car form) (list* 'lambda (cadadr form) body)))) | |
| 795 (let ((found (assq (cadr form) env))) | |
| 2153 | 796 ;; XEmacs: cadr/caddr operate on nil without errors |
| 428 | 797 (if (eq (cadr (caddr found)) 'cl-labels-args) |
| 798 (cl-macroexpand-all (cadr (caddr (cadddr found))) env) | |
| 799 form)))) | |
| 800 ((memq (car form) '(defun defmacro)) | |
| 801 (list* (car form) (nth 1 form) (cl-macroexpand-body (cddr form) env))) | |
| 802 ((and (eq (car form) 'progn) (not (cddr form))) | |
| 803 (cl-macroexpand-all (nth 1 form) env)) | |
| 804 ((eq (car form) 'setq) | |
| 805 (let* ((args (cl-macroexpand-body (cdr form) env)) (p args)) | |
| 806 (while (and p (symbolp (car p))) (setq p (cddr p))) | |
| 807 (if p (cl-macroexpand-all (cons 'setf args)) (cons 'setq args)))) | |
| 808 (t (cons (car form) (cl-macroexpand-body (cdr form) env))))) | |
| 809 | |
| 810 (defun cl-macroexpand-body (body &optional env) | |
| 811 (mapcar (function (lambda (x) (cl-macroexpand-all x env))) body)) | |
| 812 | |
| 813 (defun cl-prettyexpand (form &optional full) | |
| 814 (message "Expanding...") | |
| 815 (let ((cl-macroexpand-cmacs full) (cl-compiling-file full) | |
| 816 (byte-compile-macro-environment nil)) | |
| 817 (setq form (cl-macroexpand-all form | |
| 818 (and (not full) '((block) (eval-when))))) | |
| 819 (message "Formatting...") | |
| 820 (prog1 (cl-prettyprint form) | |
| 821 (message "")))) | |
| 822 | |
| 823 | |
| 824 | |
| 825 (run-hooks 'cl-extra-load-hook) | |
| 826 | |
| 2153 | 827 ;; XEmacs addition |
| 428 | 828 (provide 'cl-extra) |
| 829 | |
| 2153 | 830 ;;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed |
| 428 | 831 ;;; cl-extra.el ends here |