diff --git a/contrib/slime/contrib/swank-fuzzy.lisp b/contrib/slime/contrib/swank-fuzzy.lisp index 97ed8c5f44d63a4ae7c8d3091cfa57bb43edfafc..5ecf466891fa9c92c0be0e8dd919c05ced786442 100644 --- a/contrib/slime/contrib/swank-fuzzy.lisp +++ b/contrib/slime/contrib/swank-fuzzy.lisp @@ -621,8 +621,7 @@ capitalized, while the rest of the string will be lower-case." "Given a list of completion objects such as on returned by FUZZY-COMPLETION-SET, format the list into user-readable output for interactive debugging purpose." - (let ((max-len - (loop for winner in winners maximizing (length (first winner))))) + (let ((max-len (loop for winner in winners maximizing (length (first winner))))) (loop for (sym score result) in winners do (format t "~&~VA score ~8,2F ~A" max-len (highlight-completion result sym) score result)))) diff --git a/contrib/slime/swank-backend.lisp b/contrib/slime/swank-backend.lisp index 39e921bb6cf8794c63f2914795e380a58899a8d0..58ac3afd310c42bb1a1111bfa91504d0e26bcc7d 100644 --- a/contrib/slime/swank-backend.lisp +++ b/contrib/slime/swank-backend.lisp @@ -10,7 +10,7 @@ ;;; separately for each Lisp. Each is declared as a generic function ;;; for which swank-.lisp provides methods. -(declaim (optimize (debug 3) (safety 3) (speed 2))) +;;(declaim (optimize (debug 3) (safety 3) (speed 2))) (defpackage :swank-backend (:use :common-lisp) diff --git a/contrib/slime/swank-loader.lisp b/contrib/slime/swank-loader.lisp index fb63a4ead055b8746896cc543ed7f3f719615de8..7ea5e944113e0fe0e8ad36c2bdbffbe525d3cee4 100644 --- a/contrib/slime/swank-loader.lisp +++ b/contrib/slime/swank-loader.lisp @@ -178,8 +178,14 @@ If LOAD is true, load the fasl file." ;; everything after this too. (setq needs-recompile t) (setq state :compile) - ;;(proclaim '(optimize (debug 3) (safety 3) (speed 2))) ;; debug - (let (;;(compiler::*c-file* t) (compiler::*h-file* t) (compiler::*data-file* t) ;; help debug MKCL. + ;; (format t "~&About to call compile-file with these settings: ~ + ;; speed = ~S, safety = ~S, space = ~S, debug = ~S.~%" + ;; compiler::*speed* compiler::*safety* compiler::*space* compiler::*debug*) + ;;(proclaim '(optimize (debug 3) (safety 3) (speed 2))) ;; debug JCB + (let (;;(compiler::*c-file* t) (compiler::*h-file* t) (compiler::*data-file* t) ;; help debug MKCL. JCB + ;;(compiler::*trace-cc* t) ;; show gcc activity + ;;(*compile-verbose* t) + ;;(*compile-print* t) ) (or (compile-file src :output-file dest :print nil :verbose t) ;; An implementation may not necessarily signal a diff --git a/contrib/slime/swank-mkcl.lisp b/contrib/slime/swank-mkcl.lisp index 5b59b5aafc4ef23e2e9ea22381cefc05037c0d32..ed529c03db1b04f23f674b079d48c0a98fc6b544 100644 --- a/contrib/slime/swank-mkcl.lisp +++ b/contrib/slime/swank-mkcl.lisp @@ -10,11 +10,11 @@ (in-package :swank-backend) -(declaim (optimize (debug 3))) +;;(declaim (optimize (debug 3))) (defvar *tmp*) -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (:compile-toplevel :load-toplevel) (if (find-package :gray) (import-from :gray *gray-stream-symbols* :swank-backend) (import-from :ext *gray-stream-symbols* :swank-backend)) @@ -29,23 +29,22 @@ ) ) ;; eval-when - + ;;; UTF8 (defimplementation string-to-utf8 (string) - ;;(sb-ext:string-to-octets string :external-format :utf8) - (mkcl:octets (si:utf-8 string)) - ) + (mkcl:octets (si:utf-8 string))) (defimplementation utf8-to-string (octets) - ;;(sb-ext:octets-to-string octets :external-format :utf8) - (string (si:utf-8 octets)) - ) + (string (si:utf-8 octets))) ;;;; TCP Server -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (:compile-toplevel :load-toplevel) + ;; At compile-time we need access to the sb-bsd-sockets package for the + ;; the following code to be read properly. + ;; It is a bit a shame we have to load the entire module to get that. (require 'sockets)) @@ -341,7 +340,10 @@ (si:compiled-function-name f) ) -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (:compile-toplevel :load-toplevel) + ;; At compile-time we need access to the walker package for the + ;; the following code to be read properly. + ;; It is a bit a shame we have to load the entire module to get that. (require 'walker)) (defimplementation macroexpand-all (form) @@ -364,7 +366,7 @@ ;;; Debugging -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (:compile-toplevel :load-toplevel) (import '(si::*break-env* si::*ihs-top* @@ -640,7 +642,10 @@ ;;;; Profiling -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (:compile-toplevel :load-toplevel) + ;; At compile-time we need access to the profile package for the + ;; the following code to be read properly. + ;; It is a bit a shame we have to load the entire module to get that. (require 'profile)) @@ -875,11 +880,9 @@ ;;(format t "~&: ~S~%" mt:*thread*) (finish-output) (handler-case (setq got-one (mt:semaphore-wait (mailbox.semaphore mbox) 2)) - ;;(sleep 0.2) (condition (condition) - (format t "~&Something went bad with semaphore-wait ~A~%" condition) + (format t "~&In (swank-mkcl) receive-if: Something went bad with semaphore-wait ~A~%" condition) (finish-output) - ;;(break) nil ) ) @@ -897,22 +900,12 @@ ;;(format t "/ ~S~%" mt:*thread*) (finish-output) (when (eq timeout t) (return (values nil t))) - ;; (handler-case -;; (setq got-one (mt:semaphore-wait (mailbox.semaphore mbox) 2)) -;; ;;(sleep 0.2) -;; (condition (condition) -;; (format t "~&Something went bad with semaphore-wait ~A~%" condition) (finish-output) -;; ;;(break) -;; nil -;; ) -;; ) ;; (unless got-one -;; (format t "~&semaphore-wait timed out!~%")) - ;;(format t "~&= ~S~%" mt:*thread*) (finish-output) +;; (format t "~&In (swank-mkcl) receive-if: semaphore-wait timed out!~%")) ) ) (condition (condition) - (format t "~&Error in receive-if: ~S~%" condition) (finish-output) + (format t "~&Error in (swank-mkcl) receive-if: ~S, ~A~%" condition condition) (finish-output) nil ) ) diff --git a/contrib/slime/swank-rpc.lisp b/contrib/slime/swank-rpc.lisp index 3e6507e0a3f9080dbfbacc1f48cf1312a0a32375..0858a15a03cc7463ece515e938dcbf99b9e2f2a8 100644 --- a/contrib/slime/swank-rpc.lisp +++ b/contrib/slime/swank-rpc.lisp @@ -8,7 +8,7 @@ ;;; are disclaimed. ;;; -(declaim (optimize (debug 3) (safety 3) (speed 2))) +;;(declaim (optimize (debug 3) (safety 3) (speed 2))) (defpackage #:swank-rpc (:use :cl) diff --git a/contrib/slime/swank.lisp b/contrib/slime/swank.lisp index d03bcbe91663bdfadf71f1300b28b17c2f4220e5..9f7f0c2bdcb5a1ccff4bc8a2db8d3cfcd925a93d 100644 --- a/contrib/slime/swank.lisp +++ b/contrib/slime/swank.lisp @@ -10,7 +10,7 @@ ;;; them separately for each Lisp implementation. These extensions are ;;; available to us here via the `SWANK-BACKEND' package. -(declaim (optimize (debug 3) (safety 3) (speed 2))) +;;(declaim (optimize (debug 3) (safety 3) (speed 2))) (defpackage :swank (:use :cl :swank-backend :swank-match :swank-rpc) @@ -2440,13 +2440,19 @@ Record compiler notes signalled as `compiler-condition's." (lambda () (let ((pathname (filename-to-pathname filename)) (*compile-print* nil) (*compile-verbose* t)) + ;;(proclaim '(optimize (debug 3) (safety 3) (speed 2))) ;; debug JCB (multiple-value-bind (output-pathname warnings? failure?) - (swank-compile-file pathname - (fasl-pathname pathname options) - nil - (or (guess-external-format pathname) - :default) - :policy policy) + (let (;;(compiler::*c-file* t) (compiler::*h-file* t) (compiler::*data-file* t) ;; help debug MKCL. JCB + ;;(compiler::*trace-cc* t) ;; show gcc activity + ;;(*compile-verbose* t) + ;;(*compile-print* t) + ) + (swank-compile-file pathname + (fasl-pathname pathname options) + nil + (or (guess-external-format pathname) + :default) + :policy policy)) (declare (ignore warnings?)) (values (not failure?) load-p output-pathname)))))))