[armedbear-cvs] r12020 - trunk/abcl/src/org/armedbear/lisp/scripting/lisp

[Alessio Stalla]

Author: astalla
Date: Wed Jun 24 15:07:33 2009
New Revision: 12020

Log:
Corrected the installation and use of the throwing debugger (sys:%debugger-hook-function).


Modified:
   trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp
   trunk/abcl/src/org/armedbear/lisp/scripting/lisp/config.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp	Wed Jun 24 15:07:33 2009
@@ -65,15 +65,12 @@
 
 (defmacro eval-in-script-context ((global-bindings engine-bindings stdin stdout script-context)
 				  body)
-  "Sets up an environment in which to evaluate a piece of code coming from Java through the JSR-223 methods."
+  "Sets up a context in which to evaluate a piece of code coming from Java through the JSR-223 methods."
   (let ((actual-global-bindings (gensym))
 	(actual-engine-bindings (gensym)))
     `(let ((*package* (find-package :abcl-script-user))
 	   (*standard-input* ,stdin)
 	   (*standard-output* ,stdout)
-	   (*debugger-hook* (if *use-throwing-debugger*
-				#'sys::%debugger-hook-function
-				*debugger-hook*))
 	   (,actual-global-bindings (generate-bindings ,global-bindings))
 	   (,actual-engine-bindings (generate-bindings ,engine-bindings)))
        (eval `(let (,@,actual-global-bindings)

Modified: trunk/abcl/src/org/armedbear/lisp/scripting/lisp/config.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/scripting/lisp/config.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/scripting/lisp/config.lisp	Wed Jun 24 15:07:33 2009
@@ -40,11 +40,11 @@
 (defparameter *use-throwing-debugger* t)
 
 (defun configure-abcl (abcl-script-engine)
+  (when *use-throwing-debugger*
+    (setf *debugger-hook* #'sys::%debugger-hook-function))
   (when *launch-swank-at-startup*
     (unless *swank-dir*
       (error "Swank directory not specified, please set *swank-dir*"))
-    (when *use-throwing-debugger*
-      (setf *debugger-hook* #'sys::%debugger-hook-function))
     (pushnew *swank-dir* asdf:*central-registry* :test #'equal)
     (asdf:oos 'asdf:load-op :swank)
     (ext:make-thread (lambda () (funcall (find-symbol