[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] pp-macroexpansion
From: |
Johannes Weiner |
Subject: |
[PATCH] pp-macroexpansion |
Date: |
Mon, 20 Aug 2007 17:25:14 +0200 |
User-agent: |
Mutt/1.5.16 (2007-06-11) |
Hi again,
On Mon, Aug 20, 2007 at 03:31:26AM +0200, Johannes Weiner wrote:
> > here is a patch that extracts last-sexp from already existing code so that
> > one
> > can use last-sexp for other purposes too.
>
> My real goals where of course, interactive macro expansion while editing lisp
> code. So I implemented that also. The result is now a more generalized
> operation functionality on the sexp before point.
I realized now that macroexpansion really should not be done without
pretty-printing, the resulting forms are unreadable when they are more than
just a setf -> setq expansion.
So please forget about the above patches, here is one that extends the code in
pp.el by `pp-macroexpand-expression' and `pp-macroexpand-last-sexp'.
The code is now a lot shorter, more readable and the results more usable.
Diff attached, have fun!
Hannes
diff -Naur emacs.orig/lisp/emacs-lisp/pp.el emacs/lisp/emacs-lisp/pp.el
--- emacs.orig/lisp/emacs-lisp/pp.el 2007-08-20 16:51:28.000000000 +0200
+++ emacs/lisp/emacs-lisp/pp.el 2007-08-20 17:18:48.000000000 +0200
@@ -97,14 +97,10 @@
(princ (pp-to-string object) (or stream standard-output)))
;;;###autoload
-(defun pp-eval-expression (expression)
- "Evaluate EXPRESSION and pretty-print its value.
-Also add the value to the front of the list in the variable `values'."
- (interactive
- (list (read-from-minibuffer "Eval: " nil read-expression-map t
- 'read-expression-history)))
- (message "Evaluating...")
- (setq values (cons (eval expression) values))
+(defun pp-display-expression (expression out-buffer-name)
+ "Prettify and display EXPRESSION in an appropriate way,
+depending on its printed length. If a temporary buffer is needed
+for representation, it will be named after OUT-BUFFER-NAME."
(let* ((old-show-function temp-buffer-show-function)
;; Use this function to display the buffer.
;; This function either decides not to display it at all
@@ -128,23 +124,37 @@
(select-window window)
(run-hooks 'temp-buffer-show-hook))
(select-window old-selected)
- (message "Evaluating...done. \
-See buffer *Pp Eval Output*.")))
+ (message "See buffer %s." out-buffer-name)))
(message "%s" (buffer-substring (point-min) (point)))
))))))
- (with-output-to-temp-buffer "*Pp Eval Output*"
- (pp (car values))
+ (with-output-to-temp-buffer out-buffer-name
+ (pp expression)
(with-current-buffer standard-output
(emacs-lisp-mode)
(setq buffer-read-only nil)
(set (make-local-variable 'font-lock-verbose) nil)))))
;;;###autoload
-(defun pp-eval-last-sexp (arg)
- "Run `pp-eval-expression' on sexp before point (which see).
-With argument, pretty-print output into current buffer.
-Ignores leading comment characters."
- (interactive "P")
+(defun pp-eval-expression (expression)
+ "Evaluate EXPRESSION and pretty-print its value.
+Also add the value to the front of the list in the variable `values'."
+ (interactive
+ (list (read-from-minibuffer "Eval: " nil read-expression-map t
+ 'read-expression-history)))
+ (message "Evaluating...")
+ (setq values (cons (eval expression) values))
+ (pp-display-expression (car values) "*Pp Eval Output*"))
+
+;;;###autoload
+(defun pp-macroexpand-expression (expression)
+ "Macroexpand EXPRESSION and pretty-print its value."
+ (interactive
+ (list (read-from-minibuffer "Macroexpand: " nil read-expression-map t
+ 'read-expression-history)))
+ (pp-display-expression (macroexpand expression) "*Pp Macroexpand Output*"))
+
+(defun pp-last-sexp ()
+ "Read sexp before point. Ignores leading comment characters."
(let ((stab (syntax-table)) (pt (point)) start exp)
(set-syntax-table emacs-lisp-mode-syntax-table)
(save-excursion
@@ -160,9 +170,27 @@
(setq exp (read exp)))
(setq exp (read (current-buffer)))))
(set-syntax-table stab)
- (if arg
- (insert (pp-to-string (eval exp)))
- (pp-eval-expression exp))))
+ exp))
+
+;;;###autoload
+(defun pp-eval-last-sexp (arg)
+ "Run `pp-eval-expression' on sexp before point (which see).
+With argument, pretty-print output into current buffer.
+Ignores leading comment characters."
+ (interactive "P")
+ (if arg
+ (insert (pp-to-string (eval (pp-last-sexp))))
+ (pp-eval-expression (pp-last-sexp))))
+
+;;;###autoload
+(defun pp-macroexpand-last-sexp (arg)
+ "Run `pp-macroexpand-expression' on sexp before point (which see).
+With argument, pretty-print output into current buffer.
+Ignores leading comment characters."
+ (interactive "P")
+ (if arg
+ (insert (pp-to-string (macroexpand (pp-last-sexp))))
+ (pp-macroexpand-expression (pp-last-sexp))))
;;; Test cases for quote
;; (pp-eval-expression ''(quote quote))