From 03954a1ef9830b0ca15ae246944cb4596193784b Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Mon, 11 Mar 2024 04:38:02 -0500
Subject: [PATCH] Fixed diverged leaf coloring issue

Took some debugging to figure out what was going on, but this was just
a refactoring oversight, didn't update the diverged state used to decide
how to color the leaves.

I guess this would have actually been caught earlier if I cleaned up the
code before debugging the test failures. But I wanted to reach
proof-of-concept first...

Anyways, good news, all tests are passing, so the proof-of-concept
new range removal algorithm works.
---
 lfs.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lfs.c b/lfs.c
index 165add69..fdfdd6f5 100644
--- a/lfs.c
+++ b/lfs.c
@@ -3268,6 +3268,7 @@ again:;
     if (diverging && !d_upper) {
         // no diverging branch? guess we only need one trunk then
         if (!diverged) {
+            printf("false diverge\n");
             diverging = false;
 //            // TODO too many swaps
 //            lfs_swap16(&a_tag, &b_tag);
@@ -3285,6 +3286,9 @@ again:;
             return err;
         }
 
+        // TODO can we avoid lingering unreachable tags when when d_tag=0?
+        // why does hiding this behind if d_tag=0 not work?
+        //
         // terminate diverged branch with an unreachable tag
         err = lfsr_rbyd_appendattr_(lfs, rbyd,
                 (lfsr_rbyd_isshrub(rbyd) ? LFSR_TAG_SHRUB : 0)
@@ -3353,7 +3357,8 @@ again:;
             // split less than
             a_alt = LFSR_TAG_ALT(
                     LFSR_TAG_LE,
-                    (!lfsr_tag_hasdiverged(a_tag))
+                    //(!lfsr_tag_hasdiverged(a_tag)) TODO
+                    (!diverged)
                         ? LFSR_TAG_R
                         : LFSR_TAG_B,
                     a_tag);
@@ -3379,7 +3384,8 @@ again:;
             // split greater than
             a_alt = LFSR_TAG_ALT(
                     LFSR_TAG_GT,
-                    (!lfsr_tag_hasdiverged(a_tag))
+                    // (!lfsr_tag_hasdiverged(a_tag)) TODO
+                    (!diverged)
                         ? LFSR_TAG_R
                         : LFSR_TAG_B,
                     tag);