2012-06-03 21:05:17 -04:00
|
|
|
;;; cl.el --- Compatibility aliases for the old CL library.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-06-03 21:05:17 -04:00
|
|
|
;; Copyright (C) 2012 Free Software Foundation, Inc.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-06-03 21:05:17 -04:00
|
|
|
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
|
1993-07-30 20:15:09 +00:00
|
|
|
;; Keywords: extensions
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1993-07-30 20:15:09 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:21:21 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
1994-06-17 20:04:22 +00:00
|
|
|
;;; Commentary:
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-06-03 21:05:17 -04:00
|
|
|
;; This is a compatibility file which provides the old names provided by CL
|
|
|
|
;; before we cleaned up its namespace usage.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
1994-06-17 20:04:22 +00:00
|
|
|
;;; Code:
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-06-03 21:05:17 -04:00
|
|
|
(require 'cl-lib)
|
|
|
|
|
|
|
|
;; (defun cl--rename ()
|
|
|
|
;; (let ((vdefs ())
|
|
|
|
;; (fdefs ())
|
|
|
|
;; (case-fold-search nil)
|
|
|
|
;; (files '("cl.el" "cl-macs.el" "cl-seq.el" "cl-extra.el")))
|
|
|
|
;; (dolist (file files)
|
|
|
|
;; (with-current-buffer (find-file-noselect file)
|
|
|
|
;; (goto-char (point-min))
|
|
|
|
;; (while (re-search-forward
|
|
|
|
;; "^(\\(def[^ \t\n]*\\) +'?\\(\\(\\sw\\|\\s_\\)+\\)" nil t)
|
|
|
|
;; (let ((name (match-string-no-properties 2))
|
|
|
|
;; (type (match-string-no-properties 1)))
|
|
|
|
;; (unless (string-match-p "\\`cl-" name)
|
|
|
|
;; (cond
|
|
|
|
;; ((member type '("defvar" "defconst"))
|
|
|
|
;; (unless (member name vdefs) (push name vdefs)))
|
|
|
|
;; ((member type '("defun" "defsubst" "defalias" "defmacro"))
|
|
|
|
;; (unless (member name fdefs) (push name fdefs)))
|
|
|
|
;; ((member type '("def-edebug-spec" "defsetf" "define-setf-method"
|
|
|
|
;; "define-compiler-macro"))
|
|
|
|
;; nil)
|
|
|
|
;; (t (error "Unknown type %S" type))))))))
|
|
|
|
;; (let ((re (concat "\\_<" (regexp-opt (append vdefs fdefs)) "\\_>"))
|
|
|
|
;; (conflicts ()))
|
|
|
|
;; (dolist (file files)
|
|
|
|
;; (with-current-buffer (find-file-noselect file)
|
|
|
|
;; (goto-char (point-min))
|
|
|
|
;; (while (re-search-forward re nil t)
|
|
|
|
;; (replace-match "cl-\\&"))
|
|
|
|
;; (save-buffer))))
|
|
|
|
;; (with-current-buffer (find-file-noselect "cl-rename.el")
|
|
|
|
;; (dolist (def vdefs)
|
|
|
|
;; (insert (format "(defvaralias '%s 'cl-%s)\n" def def)))
|
|
|
|
;; (dolist (def fdefs)
|
|
|
|
;; (insert (format "(defalias '%s 'cl-%s)\n" def def)))
|
|
|
|
;; (save-buffer))))
|
|
|
|
|
|
|
|
;; (defun cl--unrename ()
|
|
|
|
;; ;; Taken from "Naming Conventions" node of the doc.
|
|
|
|
;; (let* ((names '(defun* defsubst* defmacro* function* member*
|
|
|
|
;; assoc* rassoc* get* remove* delete*
|
|
|
|
;; mapcar* sort* floor* ceiling* truncate*
|
|
|
|
;; round* mod* rem* random*))
|
|
|
|
;; (files '("cl.el" "cl-lib.el" "cl-macs.el" "cl-seq.el" "cl-extra.el"))
|
|
|
|
;; (re (concat "\\_<cl-" (regexp-opt (mapcar #'symbol-name names))
|
|
|
|
;; "\\_>")))
|
|
|
|
;; (dolist (file files)
|
|
|
|
;; (with-current-buffer (find-file-noselect file)
|
|
|
|
;; (goto-char (point-min))
|
|
|
|
;; (while (re-search-forward re nil t)
|
|
|
|
;; (delete-region (1- (point)) (point)))
|
|
|
|
;; (save-buffer)))))
|
|
|
|
(dolist (var '(
|
|
|
|
;; loop-result-var
|
|
|
|
;; loop-result
|
|
|
|
;; loop-initially
|
|
|
|
;; loop-finally
|
|
|
|
;; loop-bindings
|
|
|
|
;; loop-args
|
|
|
|
;; bind-inits
|
|
|
|
;; bind-block
|
|
|
|
;; lambda-list-keywords
|
|
|
|
float-negative-epsilon
|
|
|
|
float-epsilon
|
|
|
|
least-negative-normalized-float
|
|
|
|
least-positive-normalized-float
|
|
|
|
least-negative-float
|
|
|
|
least-positive-float
|
|
|
|
most-negative-float
|
|
|
|
most-positive-float
|
|
|
|
;; custom-print-functions
|
|
|
|
))
|
|
|
|
(defvaralias var (intern (format "cl-%s" var))))
|
|
|
|
|
|
|
|
(dolist (fun '(
|
|
|
|
(get* . cl-get)
|
|
|
|
(random* . cl-random)
|
|
|
|
(rem* . cl-rem)
|
|
|
|
(mod* . cl-mod)
|
|
|
|
(round* . cl-round)
|
|
|
|
(truncate* . cl-truncate)
|
|
|
|
(ceiling* . cl-ceiling)
|
|
|
|
(floor* . cl-floor)
|
|
|
|
(rassoc* . cl-rassoc)
|
|
|
|
(assoc* . cl-assoc)
|
|
|
|
(member* . cl-member)
|
|
|
|
(delete* . cl-delete)
|
|
|
|
(remove* . cl-remove)
|
|
|
|
(defsubst* . cl-defsubst)
|
|
|
|
(sort* . cl-sort)
|
|
|
|
(function* . cl-function)
|
|
|
|
(defmacro* . cl-defmacro)
|
|
|
|
(defun* . cl-defun)
|
|
|
|
(mapcar* . cl-mapcar)
|
|
|
|
|
|
|
|
remprop
|
|
|
|
getf
|
|
|
|
tailp
|
|
|
|
list-length
|
|
|
|
nreconc
|
|
|
|
revappend
|
|
|
|
concatenate
|
|
|
|
subseq
|
|
|
|
random-state-p
|
|
|
|
make-random-state
|
|
|
|
signum
|
|
|
|
isqrt
|
|
|
|
lcm
|
|
|
|
gcd
|
|
|
|
notevery
|
|
|
|
notany
|
|
|
|
every
|
|
|
|
some
|
|
|
|
mapcon
|
|
|
|
mapcan
|
|
|
|
mapl
|
|
|
|
maplist
|
|
|
|
map
|
|
|
|
equalp
|
|
|
|
coerce
|
|
|
|
tree-equal
|
|
|
|
nsublis
|
|
|
|
sublis
|
|
|
|
nsubst-if-not
|
|
|
|
nsubst-if
|
|
|
|
nsubst
|
|
|
|
subst-if-not
|
|
|
|
subst-if
|
|
|
|
subsetp
|
|
|
|
nset-exclusive-or
|
|
|
|
set-exclusive-or
|
|
|
|
nset-difference
|
|
|
|
set-difference
|
|
|
|
nintersection
|
|
|
|
intersection
|
|
|
|
nunion
|
|
|
|
union
|
|
|
|
rassoc-if-not
|
|
|
|
rassoc-if
|
|
|
|
assoc-if-not
|
|
|
|
assoc-if
|
|
|
|
member-if-not
|
|
|
|
member-if
|
|
|
|
merge
|
|
|
|
stable-sort
|
|
|
|
search
|
|
|
|
mismatch
|
|
|
|
count-if-not
|
|
|
|
count-if
|
|
|
|
count
|
|
|
|
position-if-not
|
|
|
|
position-if
|
|
|
|
position
|
|
|
|
find-if-not
|
|
|
|
find-if
|
|
|
|
find
|
|
|
|
nsubstitute-if-not
|
|
|
|
nsubstitute-if
|
|
|
|
nsubstitute
|
|
|
|
substitute-if-not
|
|
|
|
substitute-if
|
|
|
|
substitute
|
|
|
|
delete-duplicates
|
|
|
|
remove-duplicates
|
|
|
|
delete-if-not
|
|
|
|
delete-if
|
|
|
|
remove-if-not
|
|
|
|
remove-if
|
|
|
|
replace
|
|
|
|
fill
|
|
|
|
reduce
|
|
|
|
compiler-macroexpand
|
|
|
|
define-compiler-macro
|
|
|
|
assert
|
|
|
|
check-type
|
|
|
|
typep
|
|
|
|
deftype
|
|
|
|
defstruct
|
|
|
|
define-modify-macro
|
|
|
|
callf2
|
|
|
|
callf
|
|
|
|
letf*
|
|
|
|
letf
|
|
|
|
rotatef
|
|
|
|
shiftf
|
|
|
|
remf
|
|
|
|
psetf
|
|
|
|
setf
|
|
|
|
get-setf-method
|
|
|
|
defsetf
|
2012-06-07 15:25:48 -04:00
|
|
|
(define-setf-method . cl-define-setf-expander)
|
2012-06-03 21:05:17 -04:00
|
|
|
define-setf-expander
|
|
|
|
declare
|
|
|
|
the
|
|
|
|
locally
|
|
|
|
multiple-value-setq
|
|
|
|
multiple-value-bind
|
|
|
|
lexical-let*
|
|
|
|
lexical-let
|
|
|
|
symbol-macrolet
|
|
|
|
macrolet
|
|
|
|
labels
|
|
|
|
flet
|
|
|
|
progv
|
|
|
|
psetq
|
|
|
|
do-all-symbols
|
|
|
|
do-symbols
|
|
|
|
dotimes
|
|
|
|
dolist
|
|
|
|
do*
|
|
|
|
do
|
|
|
|
loop
|
|
|
|
return-from
|
|
|
|
return
|
|
|
|
block
|
|
|
|
etypecase
|
|
|
|
typecase
|
|
|
|
ecase
|
|
|
|
case
|
|
|
|
load-time-value
|
|
|
|
eval-when
|
|
|
|
destructuring-bind
|
|
|
|
gentemp
|
|
|
|
gensym
|
|
|
|
pairlis
|
|
|
|
acons
|
|
|
|
subst
|
|
|
|
adjoin
|
|
|
|
copy-list
|
|
|
|
ldiff
|
|
|
|
list*
|
|
|
|
cddddr
|
|
|
|
cdddar
|
|
|
|
cddadr
|
|
|
|
cddaar
|
|
|
|
cdaddr
|
|
|
|
cdadar
|
|
|
|
cdaadr
|
|
|
|
cdaaar
|
|
|
|
cadddr
|
|
|
|
caddar
|
|
|
|
cadadr
|
|
|
|
cadaar
|
|
|
|
caaddr
|
|
|
|
caadar
|
|
|
|
caaadr
|
|
|
|
caaaar
|
|
|
|
cdddr
|
|
|
|
cddar
|
|
|
|
cdadr
|
|
|
|
cdaar
|
|
|
|
caddr
|
|
|
|
cadar
|
|
|
|
caadr
|
|
|
|
caaar
|
|
|
|
tenth
|
|
|
|
ninth
|
|
|
|
eighth
|
|
|
|
seventh
|
|
|
|
sixth
|
|
|
|
fifth
|
|
|
|
fourth
|
|
|
|
third
|
|
|
|
endp
|
|
|
|
rest
|
|
|
|
second
|
|
|
|
first
|
|
|
|
svref
|
|
|
|
copy-seq
|
|
|
|
evenp
|
|
|
|
oddp
|
|
|
|
minusp
|
|
|
|
plusp
|
|
|
|
floatp-safe
|
|
|
|
declaim
|
|
|
|
proclaim
|
|
|
|
nth-value
|
|
|
|
multiple-value-call
|
|
|
|
multiple-value-apply
|
|
|
|
multiple-value-list
|
|
|
|
values-list
|
|
|
|
values
|
|
|
|
pushnew
|
|
|
|
push
|
|
|
|
pop
|
|
|
|
decf
|
|
|
|
incf
|
|
|
|
))
|
|
|
|
(let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun)))
|
|
|
|
(intern (format "cl-%s" fun)))))
|
|
|
|
(defalias fun new)
|
|
|
|
;; If `cl-foo' is declare inline, then make `foo' inline as well, and
|
2012-06-05 11:41:12 -04:00
|
|
|
;; similarly. Same for edebug specifications, indent rules and
|
2012-06-03 21:05:17 -04:00
|
|
|
;; doc-string position.
|
|
|
|
;; FIXME: For most of them, we should instead follow aliases
|
|
|
|
;; where applicable.
|
2012-06-05 11:41:12 -04:00
|
|
|
(dolist (prop '(byte-optimizer doc-string-elt edebug-form-spec
|
2012-06-03 21:05:17 -04:00
|
|
|
lisp-indent-function))
|
|
|
|
(if (get new prop)
|
|
|
|
(put fun prop (get new prop))))))
|
2011-10-27 00:21:00 -07:00
|
|
|
|
Move old compatiblity to cl.el. Remove cl-macroexpand-all.
* emacs-lisp/cl-extra.el (cl-map-keymap, cl-copy-tree)
(cl-not-hash-table, cl-builtin-gethash, cl-builtin-remhash)
(cl-builtin-clrhash, cl-builtin-maphash, cl-gethash, cl-puthash)
(cl-remhash, cl-clrhash, cl-maphash, cl-make-hash-table)
(cl-hash-table-p, cl-hash-table-count): Move to cl.el.
(cl-macroexpand-cmacs): Remove var.
(cl-macroexpand-all, cl-macroexpand-body): Remove funs.
Use macroexpand-all instead.
* emacs-lisp/cl-lib.el (cl-macro-environment): Remove decl.
(cl-macroexpand): Move to cl-macs.el and rename to cl--sm-macroexpand.
(cl-member): Remove old alias.
* emacs-lisp/cl-macs.el (cl-macro-environment): Remove var.
Use macroexpand-all-environment instead.
(cl--old-macroexpand): New var.
(cl--sm-macroexpand): New function.
(cl-symbol-macrolet): Use it during macro expansion.
(cl--function-convert-cache): New var.
(cl--function-convert): New function, extracted from
cl-macroexpand-all.
(cl-lexical-let): Use it.
* emacs-lisp/cl.el (cl-macroexpand, cl-macro-environment)
(cl-macroexpand-all, cl-not-hash-table, cl-builtin-gethash)
(cl-builtin-remhash, cl-builtin-clrhash, cl-builtin-maphash)
(cl-map-keymap, cl-copy-tree, cl-gethash, cl-puthash, cl-remhash)
(cl-clrhash, cl-maphash, cl-make-hash-table, cl-hash-table-p)
(cl-hash-table-count): Add old compatibility aliases.
2012-06-07 15:48:22 -04:00
|
|
|
;;; Additional compatibility code
|
|
|
|
;; For names that were clean but really aren't needed any more.
|
|
|
|
|
|
|
|
(defalias 'cl-macroexpand 'macroexpand)
|
|
|
|
(defvaralias 'cl-macro-environment 'macroexpand-all-environment)
|
|
|
|
(defalias 'cl-macroexpand-all 'macroexpand-all)
|
|
|
|
|
|
|
|
;;; Hash tables.
|
|
|
|
;; This is just kept for compatibility with code byte-compiled by Emacs-20.
|
|
|
|
|
|
|
|
;; No idea if this might still be needed.
|
|
|
|
(defun cl-not-hash-table (x &optional y &rest z)
|
|
|
|
(signal 'wrong-type-argument (list 'cl-hash-table-p (or y x))))
|
|
|
|
|
|
|
|
(defvar cl-builtin-gethash (symbol-function 'gethash))
|
|
|
|
(defvar cl-builtin-remhash (symbol-function 'remhash))
|
|
|
|
(defvar cl-builtin-clrhash (symbol-function 'clrhash))
|
|
|
|
(defvar cl-builtin-maphash (symbol-function 'maphash))
|
|
|
|
|
|
|
|
(defalias 'cl-map-keymap 'map-keymap)
|
|
|
|
(defalias 'cl-copy-tree 'copy-tree)
|
|
|
|
(defalias 'cl-gethash 'gethash)
|
|
|
|
(defalias 'cl-puthash 'puthash)
|
|
|
|
(defalias 'cl-remhash 'remhash)
|
|
|
|
(defalias 'cl-clrhash 'clrhash)
|
|
|
|
(defalias 'cl-maphash 'maphash)
|
|
|
|
(defalias 'cl-make-hash-table 'make-hash-table)
|
|
|
|
(defalias 'cl-hash-table-p 'hash-table-p)
|
|
|
|
(defalias 'cl-hash-table-count 'hash-table-count)
|
|
|
|
|
|
|
|
;; FIXME: More candidates: define-modify-macro, define-setf-expander, lexical-let.
|
|
|
|
|
2008-07-16 02:49:35 +00:00
|
|
|
(provide 'cl)
|
1993-07-30 20:15:09 +00:00
|
|
|
;;; cl.el ends here
|