[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/oclosure 3119e59252 07/25: lisp/emacs-lisp/oclosure.el: Rename `
From: |
Stefan Monnier |
Subject: |
scratch/oclosure 3119e59252 07/25: lisp/emacs-lisp/oclosure.el: Rename `oclosure-make` to `oclosure-lambda` |
Date: |
Fri, 31 Dec 2021 15:40:56 -0500 (EST) |
branch: scratch/oclosure
commit 3119e5925210b28cd25bad50dc9a1482a1265435
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
lisp/emacs-lisp/oclosure.el: Rename `oclosure-make` to `oclosure-lambda`
* lisp/emacs-lisp/oclosure.el (oclosure-lambda): Rename from
`oclosure-make`.
* lisp/emacs-lisp/cl-generic.el (cl-generic-call-method):
* test/lisp/emacs-lisp/oclosure-tests.el (oclosure-tests):
* lisp/kmacro.el (kmacro-lambda-form): Adjust accordingly.
---
lisp/emacs-lisp/cl-generic.el | 2 +-
lisp/emacs-lisp/oclosure.el | 2 +-
lisp/kmacro.el | 4 ++--
test/lisp/emacs-lisp/oclosure-tests.el | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 1407b3fffa..ba15470751 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -742,7 +742,7 @@ FUN is the function that should be called when METHOD calls
(if fun
(lambda (&rest cnm-args)
(apply fun (or cnm-args args)))
- (oclosure-make cl--generic-nnm () (&rest cnm-args)
+ (oclosure-lambda cl--generic-nnm () (&rest cnm-args)
(apply #'cl-no-next-method generic method
(or cnm-args args))))
args)))))
diff --git a/lisp/emacs-lisp/oclosure.el b/lisp/emacs-lisp/oclosure.el
index 9c05f1752c..6015e32b91 100644
--- a/lisp/emacs-lisp/oclosure.el
+++ b/lisp/emacs-lisp/oclosure.el
@@ -186,7 +186,7 @@
(defalias predname pred)
(put name 'cl-deftype-handler (lambda () type))))
-(defmacro oclosure-make (type fields args &rest body)
+(defmacro oclosure-lambda (type fields args &rest body)
(declare (indent 3) (debug (sexp (&rest (sexp form)) sexp def-body)))
;; FIXME: Provide the fields in the order specified by `type'.
(let* ((class (cl--find-class type))
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 0fd693950e..93a93a461b 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -823,8 +823,8 @@ If kbd macro currently being defined end it before
activating it."
;; or only `mac' is provided, as a list (MAC COUNTER FORMAT).
;; The first is used from `insert-kbd-macro' and `edmacro-finish-edit',
;; while the second is used from within this file.
- (oclosure-make kmacro-function ((mac (if counter (list mac counter format)
mac)))
- (&optional arg)
+ (oclosure-lambda kmacro-function ((mac (if counter (list mac counter format)
mac)))
+ (&optional arg)
(interactive "p")
(kmacro-exec-ring-item mac arg)))
diff --git a/test/lisp/emacs-lisp/oclosure-tests.el
b/test/lisp/emacs-lisp/oclosure-tests.el
index b5436e5ea2..04b214b9ea 100644
--- a/test/lisp/emacs-lisp/oclosure-tests.el
+++ b/test/lisp/emacs-lisp/oclosure-tests.el
@@ -41,12 +41,12 @@
(ert-deftest oclosure-tests ()
(let* ((i 42)
- (ocl1 (oclosure-make oclosure-test ((fst 1) (snd 2) (name "hi"))
- ()
- (list fst snd i)))
- (ocl2 (oclosure-make oclosure-test ((name (cl-incf i)) (fst (cl-incf
i)))
- ()
- (list fst snd 152 i))))
+ (ocl1 (oclosure-lambda oclosure-test ((fst 1) (snd 2) (name "hi"))
+ ()
+ (list fst snd i)))
+ (ocl2 (oclosure-lambda oclosure-test ((name (cl-incf i)) (fst
(cl-incf i)))
+ ()
+ (list fst snd 152 i))))
(message "hello-1")
(should (equal (list (oclosure-test--fst ocl1)
(oclosure-test--snd ocl1)
- scratch/oclosure ae493f3513 01/25: OClosure: Hybrids between functions and defstructs, (continued)
- scratch/oclosure ae493f3513 01/25: OClosure: Hybrids between functions and defstructs, Stefan Monnier, 2021/12/31
- scratch/oclosure ae0bfc4f75 05/25: * lisp/loadup.el (oclosure): Load before `nadvice`, Stefan Monnier, 2021/12/31
- scratch/oclosure afa68def26 11/25: cl-print.el: Dispatch on `advice` type, Stefan Monnier, 2021/12/31
- scratch/oclosure fe5457ff75 19/25: oclosure.el (oclosure-lambda): Change calling convention, Stefan Monnier, 2021/12/31
- scratch/oclosure d93b0ad4d4 06/25: (interactive-form, function-docstring): New generic functions, Stefan Monnier, 2021/12/31
- scratch/oclosure a444d85977 08/25: Fix bootstrap problems and various misc issues found along the way, Stefan Monnier, 2021/12/31
- scratch/oclosure f44ee8cd53 17/25: oclosure.el (accessor): New type, Stefan Monnier, 2021/12/31
- scratch/oclosure 55a8e92413 20/25: oclosure.el: Add support for mutable slots, Stefan Monnier, 2021/12/31
- scratch/oclosure bc1d94a0d8 21/25: * lisp/emacs-lisp/oclosure.el (Commentary:): Add a few notes, Stefan Monnier, 2021/12/31
- scratch/oclosure 263172dbfb 02/25: lisp/emacs-lisp/oclosure.el: Make it available to cl-generic, Stefan Monnier, 2021/12/31
- scratch/oclosure 3119e59252 07/25: lisp/emacs-lisp/oclosure.el: Rename `oclosure-make` to `oclosure-lambda`,
Stefan Monnier <=
- scratch/oclosure 9465a7e59e 10/25: nadvice.el: Restore interactive-form handling, Stefan Monnier, 2021/12/31
- scratch/oclosure 3c9d64b602 14/25: cl-macs.el (cl--transform-lambda): Fix last change, Stefan Monnier, 2021/12/31
- scratch/oclosure 01002ebba0 18/25: oclosure.el (oclosure-define): Use `oclosure--copy` to define accessors, Stefan Monnier, 2021/12/31
- scratch/oclosure 20e5cd82ae 13/25: Fix bug#28557, Stefan Monnier, 2021/12/31
- scratch/oclosure 44dbab47f7 23/25: * lisp/emacs-lisp/oclosure.el: Remove obsolete comment, Stefan Monnier, 2021/12/31
- scratch/oclosure 1ace4acd54 22/25: Replace uniquify.el's advice with direct calls, Stefan Monnier, 2021/12/31
- scratch/oclosure 3aa60102b9 24/25: kmacro.el: Unify the lambda and the list representations, Stefan Monnier, 2021/12/31
- scratch/oclosure e9cfab679d 15/25: lisp/emacs-lisp/cl-macs.el: Align with `master`, Stefan Monnier, 2021/12/31
- scratch/oclosure e65e2bd0aa 12/25: * lisp/emacs-lisp/cl-generic.el (cl-generic--oclosure-generalizer): Fix precedence, Stefan Monnier, 2021/12/31
- scratch/oclosure de320e2003 25/25: Arrange to load `nadvice` later in `loadup.el`, Stefan Monnier, 2021/12/31