Changeset 148

Timestamp:

Dec 20, 2003, 2:45:41 AM (21 years ago)

Author:

Gary Byers

Message:

Alanr's fix to closure-inspector.

File:

• trunk/ccl/lib/describe.lisp (modified) (3 diffs)

trunk/ccl/lib/describe.lisp

@@ -1139 +1139 @@
   ((n-closed :accessor closure-n-closed)))
 
+
+
 (defmethod inspector-class ((f function)) 'function-inspector)
 (defmethod inspector-class ((f compiled-lexical-closure)) 'closure-inspector)
@@ -1160 +1162 @@
       (t (disassembly-line-n f (- n 3))))))
 
+(defmethod compute-line-count ((f closure-inspector))
+  (let* ((o (inspector-object f))
+        (nclosed (nth-value 8 (function-args (ccl::closure-function o)))))
+      (setf (closure-n-closed f) nclosed)
+      (+ (call-next-method)
+         1                              ; the function we close over
+         1                              ; "Closed over values"
+         nclosed
+         (if (disasm-p f) 1 0)))))      ; "Disassembly"
+
 (defmethod line-n ((f closure-inspector) n)
   (let ((o (inspector-object f))
@@ -1168 +1180 @@
              (values (ccl::closure-function o) "Inner lfun: " :static))
             ((eql (decf n) 0)
-             (values 0 "Closed over values" :comment #'prin1-comment))
+             (values nclosed "Closed over values" :comment #'prin1-comment))
             ((< (decf n) nclosed)
              (let* ((value (ccl::%svref o (1+ (- nclosed n))))