Changeset 13678


Ignore:
Timestamp:
Apr 27, 2010, 1:11:39 PM (10 years ago)
Author:
gz
Message:

merge back r13667 from the 1.5 branch

Location:
trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source

  • trunk/source/lib/describe.lisp

    r13067 r13678  
    12791279             (let* ((value (ccl::nth-immediate o (1+ (- nclosed n))))
    12801280                    (map (car (ccl::function-symbol-map (ccl::closure-function o))))
    1281                     (label (or (and map (svref map (+ n (- (length map) nclosed))))
     1281                    (label (or (and map (aref map (+ n (- (length map) nclosed))))
    12821282                               n))
    12831283                    (cellp (ccl::closed-over-value-p value)))
     
    13281328  (if (< (decf n) 0)
    13291329    (values nil "Disassembly:" :comment)
    1330     (let ((line (svref (disasm-info f) n)))
     1330    (let ((line (aref (disasm-info f) n)))
    13311331      (if (consp line)
    13321332        (destructuring-bind (object label instr) line
     
    13361336(defun disassembly-line-n-inspector (f n)
    13371337  (unless (< (decf n) 0)
    1338     (let ((line (svref (disasm-info f) n)))
     1338    (let ((line (aref (disasm-info f) n)))
    13391339      (and (consp line)
    13401340           (car line)
     
    13441344  (if (< (decf n) 0)
    13451345    (values "Disassembly:" nil)
    1346     (let ((line (svref (disasm-info f) n)))
     1346    (let ((line (aref (disasm-info f) n)))
    13471347      (if (consp line)
    13481348        (destructuring-bind (object label instr) line
     
    16011601
    16021602(defmethod compute-frame-info ((f error-frame) n)
    1603   (let* ((frame (svref (addresses f) n))
     1603  (let* ((frame (aref (addresses f) n))
    16041604         (context (context f))
    16051605         (marker (unavailable-value-marker f)))
     
    16651665
    16661666(defmethod line-n ((f stack-inspector) n)
    1667   (let* ((frame (svref (addresses (inspector-object f)) n)))
     1667  (let* ((frame (aref (addresses (inspector-object f)) n)))
    16681668    (ccl::cfp-lfun frame)))
    16691669
Note: See TracChangeset for help on using the changeset viewer.