[slime-cvs] CVS slime
CVS User sboukarev
sboukarev at common-lisp.net
Sat Dec 19 14:56:07 UTC 2009
Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv4318
Modified Files:
ChangeLog swank-abcl.lisp swank-backend.lisp swank-ecl.lisp
swank-sbcl.lisp
Log Message:
* contrib/swank-asdf.lisp (asdf:operation-done-p): ASDF included with some
implementations doesn't have AROUND method combination, so guard
against its usage. This will prevent swank:reload-system from working,
but it will let load swank-asdf.
Reported by Mark Evenson.
* swank-backend.lisp (defpackage): export with-symbol and
replace its fully qualified usage everywhere.
--- /project/slime/cvsroot/slime/ChangeLog 2009/12/17 10:30:32 1.1944
+++ /project/slime/cvsroot/slime/ChangeLog 2009/12/19 14:56:06 1.1945
@@ -1,3 +1,8 @@
+2009-12-19 Stas Boukarev <stassats at gmail.com>
+
+ * swank-backend.lisp (defpackage): export with-symbol and
+ replace its fully qualified usage everywhere.
+
2009-12-17 Tobias C. Rittweiler <tcr at freebits.de>
* slime.el (slime-edit-uses-xrefs): New variable. For contribs to
--- /project/slime/cvsroot/slime/swank-abcl.lisp 2009/11/26 07:06:50 1.77
+++ /project/slime/cvsroot/slime/swank-abcl.lisp 2009/12/19 14:56:06 1.78
@@ -17,15 +17,14 @@
;;; The introduction of SYS::*INVOKE-DEBUGGER-HOOK* obliterates the
;;; need for redefining BREAK. The following should thus be removed at
;;; some point in the future.
-#-#.(swank-backend::with-symbol '*invoke-debugger-hook* 'sys)
+#-#.(swank-backend:with-symbol '*invoke-debugger-hook* 'sys)
(defun sys::break (&optional (format-control "BREAK called")
&rest format-arguments)
(let ((sys::*saved-backtrace*
- #+#.(swank-backend::with-symbol 'backtrace 'sys)
+ #+#.(swank-backend:with-symbol 'backtrace 'sys)
(sys:backtrace)
- #-#.(swank-backend::with-symbol 'backtrace 'sys)
- (ext:backtrace-as-list)
- ))
+ #-#.(swank-backend:with-symbol 'backtrace 'sys)
+ (ext:backtrace-as-list)))
(with-simple-restart (continue "Return from BREAK.")
(invoke-debugger
(sys::%make-condition 'simple-condition
@@ -300,13 +299,13 @@
(defimplementation call-with-debugger-hook (hook fun)
(let ((*debugger-hook* hook)
- #+#.(swank-backend::with-symbol '*invoke-debugger-hook* 'sys)
+ #+#.(swank-backend:with-symbol '*invoke-debugger-hook* 'sys)
(sys::*invoke-debugger-hook* (make-invoke-debugger-hook hook)))
(funcall fun)))
(defimplementation install-debugger-globally (function)
(setq *debugger-hook* function)
- #+#.(swank-backend::with-symbol '*invoke-debugger-hook* 'sys)
+ #+#.(swank-backend:with-symbol '*invoke-debugger-hook* 'sys)
(setq sys::*invoke-debugger-hook* (make-invoke-debugger-hook function)))
(defvar *sldb-topframe*)
@@ -314,11 +313,11 @@
(defimplementation call-with-debugging-environment (debugger-loop-fn)
(let* ((magic-token (intern "SWANK-DEBUGGER-HOOK" 'swank))
(*sldb-topframe*
- #+#.(swank-backend::with-symbol 'backtrace 'sys)
+ #+#.(swank-backend:with-symbol 'backtrace 'sys)
(second (member magic-token (sys:backtrace)
:key #'(lambda (frame)
(first (sys:frame-to-list frame)))))
- #-#.(swank-backend::with-symbol 'backtrace 'sys)
+ #-#.(swank-backend:with-symbol 'backtrace 'sys)
(second (member magic-token (ext:backtrace-as-list)
:key #'(lambda (frame)
(first frame))))
@@ -328,9 +327,9 @@
(defun backtrace (start end)
"A backtrace without initial SWANK frames."
(let ((backtrace
- #+#.(swank-backend::with-symbol 'backtrace 'sys)
+ #+#.(swank-backend:with-symbol 'backtrace 'sys)
(sys:backtrace)
- #-#.(swank-backend::with-symbol 'backtrace 'sys)
+ #-#.(swank-backend:with-symbol 'backtrace 'sys)
(ext:backtrace-as-list)
))
(subseq (or (member *sldb-topframe* backtrace) backtrace)
@@ -345,9 +344,9 @@
(defimplementation print-frame (frame stream)
(write-string
- #+#.(swank-backend::with-symbol 'backtrace 'sys)
+ #+#.(swank-backend:with-symbol 'backtrace 'sys)
(sys:frame-to-string frame)
- #-#.(swank-backend::with-symbol 'backtrace 'sys)
+ #-#.(swank-backend:with-symbol 'backtrace 'sys)
(string-trim '(#\space #\newline) (prin1-to-string frame))
stream))
--- /project/slime/cvsroot/slime/swank-backend.lisp 2009/12/10 22:21:09 1.186
+++ /project/slime/cvsroot/slime/swank-backend.lisp 2009/12/19 14:56:06 1.187
@@ -42,7 +42,7 @@
#:emacs-inspect
#:label-value-line
#:label-value-line*
- ))
+ #:with-symbol))
(defpackage :swank-mop
(:use)
--- /project/slime/cvsroot/slime/swank-ecl.lisp 2009/11/13 19:55:04 1.49
+++ /project/slime/cvsroot/slime/swank-ecl.lisp 2009/12/19 14:56:06 1.50
@@ -305,13 +305,13 @@
(declare (ignore position))
(if file (is-swank-source-p file)))))
-#+#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+#+#.(swank-backend:with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
(defmacro find-ihs-top (x)
(if (< ext:+ecl-version-number+ 90601)
`(si::ihs-top ,x)
'(si::ihs-top)))
-#-#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+#-#.(swank-backend:with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
(defmacro find-ihs-top (x)
`(si::ihs-top ,x))
@@ -379,11 +379,11 @@
(let ((functions '())
(blocks '())
(variables '()))
- #+#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+ #+#.(swank-backend:with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
#.(if (< ext:+ecl-version-number+ 90601)
'(setf frame (second frame))
'(setf frame (si::decode-ihs-env (second frame))))
- #-#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+ #-#.(swank-backend:with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
'(setf frame (second frame))
(dolist (record frame)
(let* ((record0 (car record))
@@ -493,11 +493,11 @@
`(:snippet
,(with-open-file (s file)
- #+#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+ #+#.(swank-backend:with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
(if (< ext:+ecl-version-number+ 90601)
(skip-toplevel-forms pos s)
(file-position s pos))
- #-#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+ #-#.(swank-backend:with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
(skip-toplevel-forms pos s)
(skip-comments-and-whitespace s)
(read-snippet s))))))))
--- /project/slime/cvsroot/slime/swank-sbcl.lisp 2009/12/16 22:02:20 1.262
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp 2009/12/19 14:56:06 1.263
@@ -372,11 +372,11 @@
;;; Utilities
-#+#.(swank-backend::with-symbol 'function-lambda-list 'sb-introspect)
+#+#.(swank-backend:with-symbol 'function-lambda-list 'sb-introspect)
(defimplementation arglist (fname)
(sb-introspect:function-lambda-list fname))
-#-#.(swank-backend::with-symbol 'function-lambda-list 'sb-introspect)
+#-#.(swank-backend:with-symbol 'function-lambda-list 'sb-introspect)
(defimplementation arglist (fname)
(sb-introspect:function-arglist fname))
@@ -396,7 +396,7 @@
flags :key #'ensure-list))
(call-next-method)))))
-#+#.(swank-backend::with-symbol 'deftype-lambda-list 'sb-introspect)
+#+#.(swank-backend:with-symbol 'deftype-lambda-list 'sb-introspect)
(defmethod type-specifier-arglist :around (typespec-operator)
(multiple-value-bind (arglist foundp)
(sb-introspect:deftype-lambda-list typespec-operator)
@@ -434,7 +434,7 @@
(sb-ext:compiler-note :note)
(error :error)
(reader-error :read-error)
- #+#.(swank-backend::with-symbol redefinition-warning sb-kernel)
+ #+#.(swank-backend:with-symbol redefinition-warning sb-kernel)
(sb-kernel:redefinition-warning
:redefinition)
(style-warning :style-warning)
@@ -594,13 +594,13 @@
(defun get-compiler-policy (default-policy)
(declare (ignorable default-policy))
- #+#.(swank-backend::with-symbol 'restrict-compiler-policy 'sb-ext)
+ #+#.(swank-backend:with-symbol 'restrict-compiler-policy 'sb-ext)
(remove-duplicates (append default-policy (sb-ext:restrict-compiler-policy))
:key #'car))
(defun set-compiler-policy (policy)
(declare (ignorable policy))
- #+#.(swank-backend::with-symbol 'restrict-compiler-policy 'sb-ext)
+ #+#.(swank-backend:with-symbol 'restrict-compiler-policy 'sb-ext)
(loop for (qual . value) in policy
do (sb-ext:restrict-compiler-policy qual value)))
@@ -847,7 +847,7 @@
(defxref who-sets)
(defxref who-references)
(defxref who-macroexpands)
- #+#.(swank-backend::with-symbol 'who-specializes-directly 'sb-introspect)
+ #+#.(swank-backend:with-symbol 'who-specializes-directly 'sb-introspect)
(defxref who-specializes who-specializes-directly))
(defun source-location-for-xref-data (xref-data)
@@ -1027,11 +1027,11 @@
(plist (sb-c::debug-source-plist dsource)))
(if (getf plist :emacs-buffer)
(emacs-buffer-source-location code-location plist)
- #+#.(swank-backend::with-symbol 'debug-source-from 'sb-di)
+ #+#.(swank-backend:with-symbol 'debug-source-from 'sb-di)
(ecase (sb-di:debug-source-from dsource)
(:file (file-source-location code-location))
(:lisp (lisp-source-location code-location)))
- #-#.(swank-backend::with-symbol 'debug-source-from 'sb-di)
+ #-#.(swank-backend:with-symbol 'debug-source-from 'sb-di)
(if (sb-di:debug-source-namestring dsource)
(file-source-location code-location)
(lisp-source-location code-location)))))
@@ -1087,10 +1087,10 @@
`(:snippet ,snippet)))))))
(defun code-location-debug-source-name (code-location)
- (namestring (truename (#+#.(swank-backend::with-symbol
+ (namestring (truename (#+#.(swank-backend:with-symbol
'debug-source-name 'sb-di)
sb-c::debug-source-name
- #-#.(swank-backend::with-symbol
+ #-#.(swank-backend:with-symbol
'debug-source-name 'sb-di)
sb-c::debug-source-namestring
(sb-di::code-location-debug-source code-location)))))
More information about the slime-cvs
mailing list