mix_depblocks -> distribute_depblocks

And add a comment what it does.

diff --git a/TODO_1.0 b/TODO_1.0
index 468bc4f74936e7c475c0e8af90a169e8e09b9604..7494c31fdc37aced8e657c85511fdfe4f3dda939 100644 (file)
--- a/TODO_1.0
+++ b/TODO_1.0
@@ -23,3 +23,7 @@
 
 - write more manpages
 
+IDEAS:
+- support REL_UNLESS aka (A & ~B)
+  useful for "Conflicts: (A unless B)"
+- support REL_WITHOUT

diff --git a/src/cplxdeps.c b/src/cplxdeps.c
index a26e69ae49bbf4ca8befcd5f5e41cb66932f1f24..8579eb6ad3a68b11d0d249e9ef5ab75639310d50 100644 (file)
--- a/src/cplxdeps.c
+++ b/src/cplxdeps.c
@@ -127,12 +127,14 @@ invert_depblocks(Pool *pool, Queue *bq, int start, int r)
   return -1;
 }
 
+/* distributive property: (a1*a2 + b1*b2) * (c1*c2 + d1*d2) = 
+   a1*a2*c1*c2 + a1*a2*d1*d2 + b1*b2*c1*c2 + b1*b2*d1*d2 */
 static int
-mix_depblocks(Pool *pool, Queue *bq, int bqcnt, int bqcnt2, int flags)
+distribute_depblocks(Pool *pool, Queue *bq, int bqcnt, int bqcnt2, int flags)
 {
   int i, j, bqcnt3;
 #ifdef CPLXDEBUG
-  printf("COMPLEX MIX %d %d %d\n", bqcnt, bqcnt2, bq->count);
+  printf("COMPLEX DISTRIBUTE %d %d %d\n", bqcnt, bqcnt2, bq->count);
 #endif
   bqcnt2 = expand_simpledeps(pool, bq, bqcnt, bqcnt2);
   bqcnt3 = bq->count;
@@ -209,7 +211,7 @@ normalize_dep_or(Pool *pool, Id dep1, Id dep2, Queue *bq, int flags, int invflag
   if (r2 == 0)
     return r1;
   if ((flags & CPLXDEPS_TODNF) == 0)
-    return mix_depblocks(pool, bq, bqcnt, bqcnt2, flags);
+    return distribute_depblocks(pool, bq, bqcnt, bqcnt2, flags);
   return -1;
 }
 
@@ -234,7 +236,7 @@ normalize_dep_and(Pool *pool, Id dep1, Id dep2, Queue *bq, int flags, int invfla
   if (r2 == 1)
     return r1;
   if ((flags & CPLXDEPS_TODNF) != 0)
-    return mix_depblocks(pool, bq, bqcnt, bqcnt2, flags);
+    return distribute_depblocks(pool, bq, bqcnt, bqcnt2, flags);
   return -1;
 }
 
@@ -258,7 +260,7 @@ normalize_dep_if_else(Pool *pool, Id dep1, Id dep2, Id dep3, Queue *bq, int flag
   if (r2 == 1)
     return r1;
   if ((flags & CPLXDEPS_TODNF) != 0)
-    return mix_depblocks(pool, bq, bqcnt, bqcnt2, flags);
+    return distribute_depblocks(pool, bq, bqcnt, bqcnt2, flags);
   return -1;
 }