diff --git a/source/clog-gui.lisp b/source/clog-gui.lisp index 5bb9561..26a6799 100644 --- a/source/clog-gui.lisp +++ b/source/clog-gui.lisp @@ -98,6 +98,7 @@ (dialog-out-stream class) (clog-break function) (clog-probe macro) + (*probe* variable) (*clog-debug-instance* variable) "CLOG-GUI - Look and Feel" @@ -118,6 +119,7 @@ ;; CLOG GUI based ebugger settings (defparameter *clog-debug-instance* nil "Default location to open debugger windows") +(defvar *probe* nil "Result value of a probe") ;; Menus (defparameter *menu-bar-class* "w3-bar w3-black w3-card-4") @@ -297,7 +299,7 @@ the moment pressed. When time-out is nil, :q quits the probe and cancel repeats the probe with out changing value. When time-out is nil modal is always nil. If auto-probe is set, modal and time-out is set to nil and the probe is run again in auto-probe seconds. If not tile is set, the symbol is -used for title. If save-value is true clog-user:*probe* is set to value of +used for title. If save-value is true clog-gui:*probe* is set to value of symbol before any change is made by dialog." `(let ((body (or ,clog-body *clog-debug-instance*)) @@ -311,7 +313,7 @@ symbol before any change is made by dialog." (setf value (ppcre:regex-replace-all "<" value "<")) (setf value (ppcre:regex-replace-all ">" value ">")) (when ,save-value - (setf clog-user:*probe* ovalue)) + (setf clog-gui:*probe* ovalue)) (input-dialog body (format nil "Probe in thread ~A :
~A New Value?" (bordeaux-threads:thread-name @@ -351,7 +353,7 @@ symbol before any change is made by dialog." :title (format nil "clog-probe ~A" title)) :q) (when ,save-value - (setf clog-user:*probe* ovalue)) + (setf clog-gui:*probe* ovalue)) (return))))) :name (format nil "clog-probe ~A" title)))))) diff --git a/source/clog-helpers.lisp b/source/clog-helpers.lisp index 894b1f7..182988b 100644 --- a/source/clog-helpers.lisp +++ b/source/clog-helpers.lisp @@ -22,14 +22,13 @@ (defpackage #:clog-user (:use #:cl #:clog #:clog-gui #:clog-web) (:import-from :clog-tools #:clog-builder-probe) - (:export :*body* :*probe* :clog-repl)) + (:export :*body* :clog-repl)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Implementation - CLOG Utilities ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defvar clog-user:*body* nil "clog-repl access to body") -(defvar clog-user:*probe* nil "Used by probes to return value of symbol") ;;;;;;;;;;;;;;;;;;;;;; ;; clog-install-dir ;; diff --git a/tools/clog-builder-probe.lisp b/tools/clog-builder-probe.lisp index 37fe1d9..67d4807 100644 --- a/tools/clog-builder-probe.lisp +++ b/tools/clog-builder-probe.lisp @@ -1,10 +1,10 @@ (in-package :clog-tools) (defparameter *inspectors* - `((:name "Set object to clog-user:*probe*" + `((:name "Set object to clog-gui:*probe*" :func ,(lambda (symbol title value clog-obj) (declare (ignore title value clog-obj)) - (setf clog-user:*probe* symbol))) + (setf clog-gui:*probe* symbol))) (:name "Print to Console" :func ,(lambda (symbol title value clog-obj) (declare (ignore symbol))