dep.lisp (recompute-dep-value): Refactor the flag calculation.

Not sure why I wrote it like that.

diff --git a/dep.lisp b/dep.lisp
index ecd16283ef72c15e2aeb2f34921d5bde020981d1..15f6e0b55a50bcbe158dace45cd8e6f8d19e2107 100644 (file)
--- a/dep.lisp
+++ b/dep.lisp
@@ -189,15 +189,16 @@ (defun recompute-dep-value (dep)
    We assume that DEP's dependencies are up-to-date already, and that DEP's
    +RECOMPUTING+ flag is set.  In the former case, DEP's dependents and
    listeners are notified, using PROPAGATE-TO-DEPENDENTS."
    We assume that DEP's dependencies are up-to-date already, and that DEP's
    +RECOMPUTING+ flag is set.  In the former case, DEP's dependents and
    listeners are notified, using PROPAGATE-TO-DEPENDENTS."

-  (let ((winning nil) (queued (logand (dep-%flags dep) +queued+)))
+  (let ((winning nil)
+       (new-flags (logior (logand (dep-%flags dep) +queued+)
+                          +value+ +deps+)))

     (flet ((update (value)
             (cond ((update-dep dep value)
     (flet ((update (value)
             (cond ((update-dep dep value)

-                   (setf (dep-flags dep) (logior +value+ +deps+ +changed+
-                                                 queued))
+                   (setf (dep-flags dep) (logior new-flags +changed+))

                    (propagate-to-dependents dep)
                    t)
                   (t
                    (propagate-to-dependents dep)
                    t)
                   (t

-                   (setf (dep-flags dep) (logior +value+ +deps+ queued))
+                   (setf (dep-flags dep) new-flags)

                    nil))))
       (unwind-protect
           (prog1 (update (new-dep-value dep)) (setf winning t))
                    nil))))
       (unwind-protect
           (prog1 (update (new-dep-value dep)) (setf winning t))