Changeset 14476

Timestamp:

Dec 9, 2010, 1:00:41 PM (14 years ago)

Author:

gz

Message:

Fix use of nx-t/nx-null in decomp-form. Tweak some debug code.

File:

• trunk/source/compiler/nx-basic.lisp (modified) (3 diffs)

trunk/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 ((nx-null acode) t)
-        ((nx-t acode) nil)
+  (cond ((nx-t acode) t)
+        ((nx-null acode) nil)
         (t (let* ((op (car acode))
                   (num (length *next-nx-operators*))