Changeset 12662

Timestamp:

Aug 24, 2009, 9:18:49 AM (15 years ago)

Author:

gz

Message:

Make the backtrace handle non-lfun frames better

File:

• trunk/source/cocoa-ide/cocoa-backtrace.lisp (modified) (2 diffs)

trunk/source/cocoa-ide/cocoa-backtrace.lisp

@@ -92 +92 @@
     (make-instance 'frame-descriptor
       :data (cons fp context)
-      :label (with-output-to-string (stream)
-               (format stream "(~S" (or (ccl:function-name lfun) lfun))
-               (if (eq args (ccl::%unbound-marker))
-                 (format stream " #<Unknown Arguments>")
-                 (loop for arg in args
-                   do (if (eq arg (ccl::%unbound-marker))
-                        (format stream " #<Unavailable>")
-                        (format stream " ~:['~;~]~s" (ccl::self-evaluating-p arg) arg))))
-               (format stream ")"))
-      :values (map 'vector
-                   (lambda (var.val)
-                     (destructuring-bind (var . val) var.val
-                       (let ((label (format nil "~:[~s~;~a~]: ~s"
-                                            (stringp var) var val)))
-                         (cons label var.val))))
-                   (cons `("Function" . ,lfun) vars)))))
+      :label (if lfun
+               (with-output-to-string (stream)
+                 (format stream "(~S" (or (ccl:function-name lfun) lfun))
+                 (if (eq args (ccl::%unbound-marker))
+                   (format stream " #<Unknown Arguments>")
+                   (loop for arg in args
+                     do (if (eq arg (ccl::%unbound-marker))
+                          (format stream " #<Unavailable>")
+                          (format stream " ~:['~;~]~s" (ccl::self-evaluating-p arg) arg))))
+                 (format stream ")"))
+               ":kernel")
+      :values (if lfun
+                (map 'vector
+                     (lambda (var.val)
+                       (destructuring-bind (var . val) var.val
+                         (let ((label (format nil "~:[~s~;~a~]: ~s"
+                                              (stringp var) var val)))
+                           (cons label var.val))))
+                     (cons `("Function" . ,lfun)
+                           (and (not (eq vars (ccl::%unbound-marker))) vars)))
+                ))))
 
 (defmethod stack-descriptor-frame ((sd stack-descriptor) index)
@@ -308 +313 @@
 (objc:defmethod (#/outlineView:isItemExpandable: :<BOOL>)
     ((self backtrace-window-controller) view item)
-    (declare (ignore view))
-    (or (%null-ptr-p item)
-        (our-frame-label-p self item)))
+  (declare (ignore view))
+  (or (%null-ptr-p item)
+      (and (our-frame-label-p self item)
+           (> (frame-descriptor-value-count (frame-label-descriptor item)) 0))))
 
 (objc:defmethod (#/outlineView:numberOfChildrenOfItem: :<NSI>nteger)