Changeset 14493 for release/1.6/source

Timestamp:

Dec 17, 2010, 8:20:39 PM (10 years ago)

Author:

gz

Message:

Merge code coverage fixes (r14476, r14477) into 1.6

Location:

release/1.6/source

Files:

• . (modified) (1 prop)
• compiler/nx-basic.lisp (modified) (3 diffs)
• library/cover.lisp (modified) (1 diff)

release/1.6/source/compiler/nx-basic.lisp

@@ -730 +730 @@
 (defmacro dbg-assert (form)
   #-debug-code-notes (declare (ignore form))
-  #+debug-code-notes `(assert ,form))
+  #+debug-code-notes `(unless ,form (cerror "Ignore assertion failure"
+                                            "Assertion failure: ~s" ',form)))
 
 (defvar *acode-right-margin* 120)
@@ -757 +758 @@
                ;; note and not a code note, so need to check for code note explicitly.
                (when (code-note-p note)
-                 (dbg-assert (null (gethash form form->note)))
+                 (dbg-assert (eq note (gethash form form->note note)))
                  (dbg-assert (null (code-note-acode-range note)))
                  (setf (gethash form form->note) note)))
@@ -838 +839 @@
 
 (defun decomp-form (acode)
-  (cond ((eq acode *nx-t*) t)
-        ((eq acode *nx-nil*) nil)
+  (cond ((nx-t acode) t)
+        ((nx-null acode) nil)
         (t (let* ((op (car acode))
                   (num (length *next-nx-operators*))

release/1.6/source/library/cover.lisp

@@ -688 +688 @@
           (multiple-value-bind (start end) (decode-file-range (code-note-acode-range note))
             (when (and start
-                       (setq start (position-if-not #'whitespacep acode :start start :end end)))
+                       (setq start (position-if-not #'whitespacep acode :start start :end end :key #'code-char)))
               (fill styles (style-for-coverage (code-note-code-coverage note))
                     :start start