Added documentation for some initargs to make-instance

[clg] / examples / ginspect.lisp

diff --git a/examples/ginspect.lisp b/examples/ginspect.lisp
index 3ff76e4085f5255508fb9699ae245a4180166bb7..c6de18eeac97f2f5845332b71daeb9a7ca2af6cd 100644 (file)
--- a/examples/ginspect.lisp
+++ b/examples/ginspect.lisp
@@ -20,12 +20,20 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: ginspect.lisp,v 1.5 2005-04-23 16:48:49 espen Exp $
+;; $Id: ginspect.lisp,v 1.13 2006-09-06 11:43:41 espen Exp $
 
-(in-package :gtk)
+#+sbcl(require :gtk)
+#+(or cmu clisp)(asdf:oos 'asdf:load-op :gtk)
+
+(defpackage "GINSPECT"
+  (:use "COMMON-LISP" "GFFI" "GLIB" "GTK" #+cmu"PCL" #+sbcl"SB-PCL" #+clisp"MOP")
+  #+clisp(:shadowing-import-from "MOP" "SLOT-DEFINITION-TYPE")
+  (:export "GINSPECT" "GINSPECT-TOPLEVELS"))
+
+(in-package "GINSPECT")
 
 (defvar *ginspect-unbound-object-marker* 
-  #+cmu (gensym "UNBOUND-OBJECT-")
+  #+(or cmu clisp)(gensym "UNBOUND-OBJECT-")
   #+sbcl sb-impl::*inspect-unbound-object-marker*)
 
 
@@ -35,6 +43,12 @@ (defgeneric object-has-parts-p (object))
 (defgeneric decompose-describe-object (object))
 
 
+;; A container to hold lisp objects "inside" the tree store
+(defclass object-container (gobject)
+  ((object :initarg :object))
+  (:metaclass gobject-class))
+
+
 (defun ginspect (object)
   (let* ((store (make-instance 'tree-store 
                 :column-types '(string string gobject boolean)
@@ -62,8 +76,8 @@ (defun ginspect (object)
             ;; Remove old children
             (when valid
               (loop while (tree-store-remove store child-iter))))
-          (let ((gobject (tree-model-value store iter 'object)))
-            (insert-parts (object-data gobject 'object) store iter))
+          (let ((container (tree-model-value store iter 'object)))
+            (insert-parts (slot-value container 'object) store iter))
           (tree-view-expand-row view path nil))))
 
     (make-instance 'dialog
@@ -81,7 +95,8 @@ (defmethod decompose-describe-object ((object t))
     (if (equal parts (list object))
        (values description nil nil)
       (values description named-p parts)))
-  (sb-impl::inspected-parts object))
+  #+sbcl(sb-impl::inspected-parts object)
+  #+clisp(values (format nil "The object is an ATOM of type ~A" (type-of object) nil nil)))
 
 (defmethod decompose-describe-object ((object (eql t)))
   (values (call-next-method) nil nil))
@@ -97,6 +112,7 @@ (defmethod decompose-describe-object ((object cons))
       (values (call-next-method) nil object)
     (values "The object is a CONS." nil (list (car object) (cdr object)))))
 
+#+(or cmu sbcl)
 (defmethod decompose-describe-object ((object #+cmu alien:system-area-pointer
                                              #+sbcl sb-alien:system-area-pointer))
   (values "The object is a SYSTEM-AREA-POINTER" nil nil))
@@ -104,32 +120,42 @@ (defmethod decompose-describe-object ((object #+cmu alien:system-area-pointer
 (defmethod decompose-describe-object ((object (eql *ginspect-unbound-object-marker*)))
   (values "The slot is unbound" nil nil))
 
-#+cmu
+#+(or cmu clisp)
 (defmethod decompose-describe-object ((object symbol))
   (values 
    (call-next-method) t
-   (cons "Name" (symbol-name object)) 
-   (cons "Package" (symbol-package objecy))
-   (cons "Value" (if (boundp object)
-                    (symbol-value object)
-                  *ginspect-unbound-object-marker*))
-   (cons "Function" (if (fboundp object)
-                       (symbol-function  object)
-                     *ginspect-unbound-object-marker*))
-   (cons "Plist" (symbol-plist object))))
-
-#+cmu
+   (list
+    (cons "Name" (symbol-name object)) 
+    (cons "Package" (symbol-package object))
+    (cons "Value" (if (boundp object)
+                     (symbol-value object)
+                   *ginspect-unbound-object-marker*))
+    (cons "Function" (if (fboundp object)
+                        (symbol-function  object)
+                      *ginspect-unbound-object-marker*))
+    (cons "Plist" (symbol-plist object)))))
+
 (defmethod decompose-describe-object ((object standard-object))
   (values 
-   (call-next-method) t
+   (format nil "The instance is an object of type ~A" 
+    (class-name (class-of object)))
+   t
    (loop
     for slotd in (class-slots (class-of object))
-    collect (let* ((slot-name (pcl:slot-definition-name slotd))
+    when (slot-readable-p slotd)
+    collect (let* ((slot-name (slot-definition-name slotd))
                   (slot-value (if (slot-boundp object slot-name)
                                   (slot-value object slot-name)
                                 *ginspect-unbound-object-marker*)))
              (cons (string slot-name) slot-value)))))
 
+#+clisp
+(defmethod decompose-describe-object ((object vector))
+  (values   
+   (format nil "The object is a ~A of length ~A" (type-of object) (length object))
+   nil
+   (coerce object 'list)))
+
 
 (defmethod object-has-parts-p ((object t))
   (nth-value 2 (decompose-describe-object object)))
@@ -152,15 +178,14 @@ (defmethod object-to-string ((object (eql *ginspect-unbound-object-marker*)))
   "<unbound>")
 
 (defmethod insert-object ((object t) store parent &optional (name ""))
-  (let ((gobject (make-instance 'gobject)) ; to "hang" the lisp object on
+  (let ((container (make-instance 'object-container :object object))
        (has-parts (object-has-parts-p object)))
-    (setf (object-data gobject 'object) object)
     (let ((iter (tree-store-append store parent 
                 (vector name (object-to-string object) 
-                        gobject (not has-parts)))))
+                        container (not has-parts)))))
       (when has-parts
        ;; Insert dummy child
-       (tree-store-append store iter (vector "" "" gobject t))))))
+       (tree-store-append store iter (vector "" "" container t))))))
 
 (defmethod insert-parts :around ((object t) store parent)
   (when (object-has-parts-p object)