option to handle evals on main thread so break can work with sbcl

clog.asd

@@ -16,7 +16,6 @@
                        #:bordeaux-threads #:trivial-open-browser #:parse-float #:quri
                        #:lack-middleware-static #:lack-request #:lack-util-writer-stream
                        #:trivial-gray-streams #:closer-mop #:mgl-pax #:cl-template #:atomics
-                       #:cl-indentify
                        #:sqlite #:cl-dbi #:cl-pass #-(or mswindows win32 cormanlisp) #:cl-isaac)
   :components ((:module "static-files"
                 :components ((:static-file "js/boot.js")))
@@ -72,8 +71,8 @@
                (:file "clog-docs")))
 
 (asdf:defsystem #:clog/tools
-  :depends-on (#:clog #:clog-ace #:clog-terminal #:s-base64 #:swank
-               #:definitions #:parenscript)
+  :depends-on (#:clog #:clog-ace #:clog-terminal #:s-base64 #:swank #:cl-indentify
+               #:definitions #:parenscript #:trivial-main-thread)
   :pathname "tools/"
   :components (;; clog-db-admin app
                (:file "clog-db-admin")

tools/clog-builder-eval.lisp

@@ -81,6 +81,7 @@ provide an interactive console.)"))
   nil)
 
 ;; Lisp code evaluation utilities
+
 (defun capture-eval (form &key (capture-console t)
                      (capture-result t)
                      (capture-result-form "=>~A~%")
@@ -89,6 +90,8 @@ provide an interactive console.)"))
                      (private-console-win nil)
                      (eval-in-package "clog-user"))
   "Capture lisp evaluaton of FORM."
+  (let ((cef
+          (lambda ()
             (let (console
                   (result (make-array '(0) :element-type 'base-char
                                       :fill-pointer 0 :adjustable t))
@@ -142,7 +145,10 @@ provide an interactive console.)"))
                     (values
                       (format nil eval-form result eval-result)
                       *package*
-               eval-result))))))))
+                      eval-result))))))))))
+    (if *clog-repl-eval-on-main-thread*
+        (trivial-main-thread:call-in-main-thread cef :blocking t)
+        (funcall cef))))
 
 (defun do-eval (obj form-string cname &key (package "clog-user") (test t) custom-boot)
   "Render, evalute and run code for panel"

tools/clog-builder-settings.lisp

@@ -58,6 +58,8 @@
 (defparameter *clog-repl-open-console-on-start* nil)
 (defparameter *clog-repl-send-result-to-console* nil)
 (defparameter *clog-repl-private-console* t)
+;; eval on main thread so (break) works for sbcl.
+(defparameter *clog-repl-eval-on-main-thread* nil)
 
 ;; Panel Builder
 

tools/preferences.lisp.sample

@@ -69,6 +69,8 @@
 (setf *clog-repl-open-console-on-start* nil)
 (setf *clog-repl-send-result-to-console* nil)
 (setf *clog-repl-private-console* t)
+;; eval on main thread so (break) works for sbcl.
+(setf *clog-repl-eval-on-main-thread* nil)
 
 ;; CLOG Panel Builder
 (setf *builder-render-right-margin* 80)