[slime-cvs] CVS update: slime/swank-openmcl.lisp

[Luke Gorrie]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv2695

Modified Files:
	swank-openmcl.lisp 
Log Message:
(ccl::force-break-in-listener): Bugfix.

Date: Mon Dec 15 11:06:52 2003
Author: lgorrie

Index: slime/swank-openmcl.lisp
diff -u slime/swank-openmcl.lisp:1.36 slime/swank-openmcl.lisp:1.37
--- slime/swank-openmcl.lisp:1.36	Mon Dec 15 10:58:45 2003
+++ slime/swank-openmcl.lisp	Mon Dec 15 11:06:52 2003
@@ -13,7 +13,7 @@
 ;;; The LLGPL is also available online at
 ;;; http://opensource.franz.com/preamble.html
 ;;;
-;;;   $Id: swank-openmcl.lisp,v 1.36 2003/12/15 15:58:45 lgorrie Exp $
+;;;   $Id: swank-openmcl.lisp,v 1.37 2003/12/15 16:06:52 lgorrie Exp $
 ;;;
 
 ;;;
@@ -71,6 +71,8 @@
 (defun without-interrupts* (body)
   (ccl:without-interrupts (funcall body)))
 
+(defvar *swank-debugger-stack-frame*)
+
 ;;; TCP Server
 
 ;; In OpenMCL, the Swank backend runs in a separate thread and simply
@@ -95,28 +97,23 @@
            (accept-loop server-socket close)))))
 
 (let ((ccl::*warn-if-redefine-kernel* nil))
-   (defun ccl::force-break-in-listener (p)
-     (ccl::process-interrupt p
-                             #'(lambda ()
-                                 (ccl::ignoring-without-interrupts
-                                  (let ((*swank-debugger-stack-frame*
-                                  nil)
-                                        (previous-p nil))
-                                    (block find-frame
-                                      (map-backtrace
-                                       #'(lambda(frame-number p tcr
-                                        lfun pc)
-                                           (declare (ignore
-                                           frame-number tcr pc))
-                                           (when (eq (ccl::lfun-name
-                                           lfun) 'swank::eval-region)
-                                             (setq
-                                             *swank-debugger-stack-frame*
-                                             previous-p)
-                                             (return-from find-frame))
-                                           (setq previous-p p))))
-                                    (invoke-debugger)
-                                    (clear-input *terminal-io*)))))))
+  (defun ccl::force-break-in-listener (p)
+    (ccl::process-interrupt
+     p
+     #'(lambda ()
+         (ccl::ignoring-without-interrupts
+          (let ((*swank-debugger-stack-frame* nil)
+                (previous-p nil))
+            (block find-frame
+              (map-backtrace
+               #'(lambda(frame-number p tcr lfun pc)
+                   (declare (ignore frame-number tcr pc))
+                   (when (eq (ccl::lfun-name lfun) 'swank::eval-region)
+                     (setq *swank-debugger-stack-frame* previous-p)
+                     (return-from find-frame))
+                   (setq previous-p p))))
+            (invoke-debugger)
+            (clear-input *terminal-io*)))))))
 
 (defun accept-loop (server-socket close)
   (unwind-protect (cond (close (accept-one-client server-socket))
@@ -155,8 +152,6 @@
       (close listener))))
 
 ;;; Evaluation
-
-(defvar *swank-debugger-stack-frame*)
 
 (defmethod ccl::application-error :before (application condition error-pointer)
   (declare (ignore application condition))