[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111097: gmm-utils.el (gmm-labels): U
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111097: gmm-utils.el (gmm-labels): Use cl-labels if available |
Date: |
Tue, 04 Dec 2012 23:24:24 +0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111097
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-04 23:24:24 +0000
message:
gmm-utils.el (gmm-labels): Use cl-labels if available
modified:
lisp/gnus/ChangeLog
lisp/gnus/gmm-utils.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2012-12-04 08:22:12 +0000
+++ b/lisp/gnus/ChangeLog 2012-12-04 23:24:24 +0000
@@ -1,5 +1,9 @@
2012-12-04 Katsumi Yamaoka <address@hidden>
+ * gmm-utils.el (gmm-labels): Use cl-labels if available.
+
+2012-12-04 Katsumi Yamaoka <address@hidden>
+
* gmm-utils.el (gmm-flet, gmm-labels): New macros.
* gnus-sync.el (gnus-sync-lesync-call)
=== modified file 'lisp/gnus/gmm-utils.el'
--- a/lisp/gnus/gmm-utils.el 2012-12-04 08:22:12 +0000
+++ b/lisp/gnus/gmm-utils.el 2012-12-04 23:24:24 +0000
@@ -435,46 +435,14 @@
(fmakunbound (car orig)))))))
(put 'gmm-flet 'lisp-indent-function 1)
-;; An alist of original function names and those unique names.
-(defvar gmm-labels-environment)
-
-(defun gmm-labels-expand (form)
- "Expand funcalls in FORM according to `gmm-labels-environment'.
-This function is a subroutine that `gmm-labels' uses to convert any
-`(FN ...)' and #'FN elements in FORM into `(funcall UN ...)' and `UN'
-respectively if `(FN . UN)' is listed in `gmm-labels-environment'."
- (cond ((or (not (consp form)) (memq (car form) '(\` backquote quote)))
- form)
- ((assq (car form) gmm-labels-environment)
- `(funcall ,(cdr (assq (car form) gmm-labels-environment))
- ,@(mapcar #'gmm-labels-expand (cdr form))))
- ((eq (car form) 'function)
- (if (and (assq (cadr form) gmm-labels-environment)
- (not (cddr form)))
- (cdr (assq (cadr form) gmm-labels-environment))
- (cons 'function (mapcar #'gmm-labels-expand (cdr form)))))
- (t
- (mapcar #'gmm-labels-expand form))))
-
(defmacro gmm-labels (bindings &rest body)
"Make temporary function bindings.
The lexical scoping is handled via `lexical-let' rather than relying
on `lexical-binding'.
\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
- (let (gmm-labels-environment def defs)
- (dolist (binding bindings)
- (push (cons (car binding)
- (make-symbol (format "--gmm-%s--" (car binding))))
- gmm-labels-environment))
- `(lexical-let ,(mapcar #'cdr gmm-labels-environment)
- (setq ,@(dolist (env gmm-labels-environment (nreverse defs))
- (setq def (cdr (assq (car env) bindings)))
- (push (cdr env) defs)
- (push `(lambda ,(car def)
- ,@(mapcar #'gmm-labels-expand (cdr def)))
- defs)))
- ,@(mapcar #'gmm-labels-expand body))))
+ `(,(progn (require 'cl) (if (fboundp 'cl-labels) 'cl-labels 'labels))
+ ,bindings ,@body))
(put 'gmm-labels 'lisp-indent-function 1)
(provide 'gmm-utils)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111097: gmm-utils.el (gmm-labels): Use cl-labels if available,
Katsumi Yamaoka <=