-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
1 changed file
with
2 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
|
||
;; Author: Nic Ferrier <[email protected]> | ||
;; Keywords: lisp | ||
;; Version: 0.0.11 | ||
;; Version: 0.0.13 | ||
;; Url: https://github.com/nicferrier/emacs-noflet | ||
|
||
;; This program is free software; you can redistribute it and/or modify | ||
|
@@ -29,6 +29,7 @@ | |
;;; Code: | ||
|
||
(eval-when-compile (require 'cl)) | ||
(require 'cl-indent) | ||
|
||
(defun noflet|base () | ||
"A base function." | ||
|
@@ -153,40 +154,6 @@ maintainers refuse to add the correct indentation spec to | |
`(cl-flet ,bindings ,@body)) | ||
|
||
|
||
(defmacro nic-lisp1 (bindings &rest body) | ||
"This makes lisp-1 functions. | ||
For example: | ||
(destructuring-bind (value func) | ||
(nic-lisp1 ((a (x) | ||
(* x 7))) | ||
(list (a 10) a)) | ||
(funcall func 6)) | ||
the nic-lisp1 form returns the value of (a 10) as well as the | ||
original function." | ||
(declare (debug ((&rest (cl-defun)) cl-declarations body)) | ||
(indent ((&whole 4 &rest (&whole 1 &lambda &body)) &body))) | ||
(let (newenv lambdas) | ||
(dolist (binding bindings) | ||
(let* ((bind-var (car binding)) | ||
(ldef `(cl-function (lambda . ,(cdr binding)))) | ||
(alias-def `(lambda (&rest cl-labels-args) | ||
(cl-list* 'funcall ',bind-var | ||
cl-labels-args)))) | ||
(push (cons bind-var alias-def) newenv) | ||
(push (cons bind-var (list ldef)) lambdas))) | ||
`(let ,lambdas | ||
,@(macroexp-unprogn | ||
(macroexpand-all | ||
`(progn ,@body) | ||
(if (assq 'function newenv) | ||
newenv | ||
(cons | ||
(cons 'function #'cl--labels-convert) | ||
newenv))))))) | ||
|
||
(provide 'noflet) | ||
|
||
;;; noflet.el ends here |