From e94c74108dda5058ff76e058f78cba484ae6e328 Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Sun, 21 Jun 2009 07:22:56 +0000 Subject: [PATCH] * swank-backend.lisp (frame-source-location): Renamed from frame-source-location-for-emacs. Update callers accordingly. --- ChangeLog | 5 +++++ slime.el | 4 ++-- swank-abcl.lisp | 2 +- swank-allegro.lisp | 2 +- swank-backend.lisp | 2 +- swank-clisp.lisp | 2 +- swank-cmucl.lisp | 2 +- swank-corman.lisp | 2 +- swank-ecl.lisp | 2 +- swank-lispworks.lisp | 2 +- swank-openmcl.lisp | 2 +- swank-sbcl.lisp | 2 +- swank-scl.lisp | 2 +- swank.lisp | 2 +- 14 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe6555fa..e967758a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-21 Helmut Eller + + * swank-backend.lisp (frame-source-location): Renamed from + frame-source-location-for-emacs. + 2009-06-20 Helmut Eller * slime.el (slime-check-fancy-symbol-name): Don't update the loop diff --git a/slime.el b/slime.el index f2ca76aa..7a1a4c8e 100644 --- a/slime.el +++ b/slime.el @@ -5772,7 +5772,7 @@ This is 0 if START and END at the same line." (defun sldb-show-frame-source (frame-number) (slime-eval-async - `(swank:frame-source-location-for-emacs ,frame-number) + `(swank:frame-source-location ,frame-number) (lambda (source-location) (destructure-case source-location ((:error message) @@ -6074,7 +6074,7 @@ was called originally." (defun sldb-recompile-frame-source (&optional raw-prefix-arg) (interactive "P") (slime-eval-async - `(swank:frame-source-location-for-emacs ,(sldb-frame-number-at-point)) + `(swank:frame-source-location ,(sldb-frame-number-at-point)) (lexical-let ((policy (slime-compute-policy raw-prefix-arg))) (lambda (source-location) (destructure-case source-location diff --git a/swank-abcl.lisp b/swank-abcl.lisp index 09017cfa..0b948f7f 100644 --- a/swank-abcl.lisp +++ b/swank-abcl.lisp @@ -284,7 +284,7 @@ (defimplementation disassemble-frame (index) (disassemble (debugger:frame-function (nth-frame index)))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) (list :error (format nil "Cannot find source for frame: ~A" (nth-frame index)))) diff --git a/swank-allegro.lisp b/swank-allegro.lisp index 1efb66e0..9dbb9351 100644 --- a/swank-allegro.lisp +++ b/swank-allegro.lisp @@ -187,7 +187,7 @@ (defimplementation disassemble-frame (index) (disassemble (debugger:frame-function (nth-frame index)))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) (let* ((frame (nth-frame index)) (expr (debugger:frame-expression frame)) (fspec (first expr))) diff --git a/swank-backend.lisp b/swank-backend.lisp index 9551369f..b9661b92 100644 --- a/swank-backend.lisp +++ b/swank-backend.lisp @@ -681,7 +681,7 @@ Return T if `restart-frame' can safely be called on the frame." (declare (ignore frame)) nil) -(definterface frame-source-location-for-emacs (frame-number) +(definterface frame-source-location (frame-number) "Return the source location for the frame associated to FRAME-NUMBER.") (definterface frame-catch-tags (frame-number) diff --git a/swank-clisp.lisp b/swank-clisp.lisp index 4493f148..7ae83ecf 100644 --- a/swank-clisp.lisp +++ b/swank-clisp.lisp @@ -521,7 +521,7 @@ Return two values: NAME and VALUE" (defimplementation restart-frame (index) (sys::redo-eval-frame (nth-frame index))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) `(:error ,(format nil "frame-source-location not implemented. (frame: ~A)" (nth-frame index)))) diff --git a/swank-cmucl.lisp b/swank-cmucl.lisp index ec19bf00..0a20ddaf 100644 --- a/swank-cmucl.lisp +++ b/swank-cmucl.lisp @@ -1535,7 +1535,7 @@ A utility for debugging DEBUG-FUNCTION-ARGLIST." (error (e) (ignore-errors (princ e stream)))))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) (code-location-source-location (di:frame-code-location (nth-frame index)))) (defimplementation eval-in-frame (form index) diff --git a/swank-corman.lisp b/swank-corman.lisp index 1e0efa5d..cf362389 100644 --- a/swank-corman.lisp +++ b/swank-corman.lisp @@ -208,7 +208,7 @@ (when vars (second (elt vars var))))) -(defimplementation frame-source-location-for-emacs (frame-number) +(defimplementation frame-source-location (frame-number) (fspec-location (frame-function (elt *frame-trace* frame-number)))) (defun break (&optional (format-control "Break") &rest format-arguments) diff --git a/swank-ecl.lisp b/swank-ecl.lisp index 8268ddb8..ca3c9cbe 100644 --- a/swank-ecl.lisp +++ b/swank-ecl.lisp @@ -373,7 +373,7 @@ (defimplementation print-frame (frame stream) (format stream "~A" (first frame))) -(defimplementation frame-source-location-for-emacs (frame-number) +(defimplementation frame-source-location (frame-number) (nth-value 1 (frame-function (elt *backtrace* frame-number)))) (defimplementation frame-catch-tags (frame-number) diff --git a/swank-lispworks.lisp b/swank-lispworks.lisp index c9050511..ccda1bab 100644 --- a/swank-lispworks.lisp +++ b/swank-lispworks.lisp @@ -383,7 +383,7 @@ Return NIL if the symbol is unbound." (declare (ignore _n _s _l)) value))) -(defimplementation frame-source-location-for-emacs (frame) +(defimplementation frame-source-location (frame) (let ((frame (nth-frame frame)) (callee (if (plusp frame) (nth-frame (1- frame))))) (if (dbg::call-frame-p frame) diff --git a/swank-openmcl.lisp b/swank-openmcl.lisp index 6a210bc2..0414f391 100644 --- a/swank-openmcl.lisp +++ b/swank-openmcl.lisp @@ -515,7 +515,7 @@ (push (list name value) result))))) (reverse result)))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) (with-frame (p context lfun pc) index (declare (ignore p context)) (if pc diff --git a/swank-sbcl.lisp b/swank-sbcl.lisp index f805cceb..0c567cbe 100644 --- a/swank-sbcl.lisp +++ b/swank-sbcl.lisp @@ -1118,7 +1118,7 @@ stack." (handler-case (code-location-source-location code-location) (error (c) (list :error (format nil "~A" c)))))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) (safe-source-location-for-emacs (sb-di:frame-code-location (nth-frame index)))) diff --git a/swank-scl.lisp b/swank-scl.lisp index 11f83e3b..ceb153c8 100644 --- a/swank-scl.lisp +++ b/swank-scl.lisp @@ -1367,7 +1367,7 @@ Signal an error if no constructor can be found." (error (e) (ignore-errors (princ e stream)))))) -(defimplementation frame-source-location-for-emacs (index) +(defimplementation frame-source-location (index) (code-location-source-location (di:frame-code-location (nth-frame index)))) (defimplementation eval-in-frame (form index) diff --git a/swank.lisp b/swank.lisp index b66af8ae..460e53dd 100644 --- a/swank.lisp +++ b/swank.lisp @@ -48,7 +48,7 @@ #:*inspector-verbose* ;; These are re-exported directly from the backend: #:buffer-first-change - #:frame-source-location-for-emacs + #:frame-source-location #:restart-frame #:sldb-step #:sldb-break