src: don't call recalcHeight in recalcHeight when it's not needed. (

#14) * src: don't call `recalcHeight` in `recalcHeight` when it's not needed.
avdva · Sep 27, 2024 · 1caf8b1 · 1caf8b1
1 parent 4785db8
commit 1caf8b1
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/src/avl.zig b/src/avl.zig
@@ -318,9 +318,8 @@ pub fn TreeWithOptions(comptime K: type, comptime V: type, comptime Cmp: fn (a:
 
         fn updateCounts(loc: Location) void {
             var mutLoc: ?Location = loc;
-            while (true) {
-                var l = mutLoc orelse break;
-                recalcCounts(l);
+            while (mutLoc) |*l| {
+                recalcCounts(l.*);
                 mutLoc = l.parent();
             }
         }
@@ -735,34 +734,32 @@ pub fn TreeWithOptions(comptime K: type, comptime V: type, comptime Cmp: fn (a:
 
         fn checkBalance(self: *Self, loc: ?Location, all_way_up: bool) void {
             var mutLoc = loc;
-            while (true) {
-                var l = mutLoc orelse break;
-                const heightChanged = recalcHeight(l);
+            while (mutLoc) |*l| {
                 const parent = l.parent();
-                switch (balance(l)) {
+                switch (balance(l.*)) {
                     -2 => {
-                        switch (balance(l.child(.left).?)) {
-                            -1, 0 => self.rr(l),
-                            1 => self.lr(l),
+                        switch (balance(l.*.child(.left).?)) {
+                            -1, 0 => self.rr(l.*),
+                            1 => self.lr(l.*),
                             else => unreachable,
                         }
                     },
                     2 => {
-                        switch (balance(l.child(.right).?)) {
-                            -1 => self.rl(l),
-                            0, 1 => self.ll(l),
+                        switch (balance(l.*.child(.right).?)) {
+                            -1 => self.rl(l.*),
+                            0, 1 => self.ll(l.*),
                             else => unreachable,
                         }
                     },
                     else => {
-                        if (!heightChanged and !all_way_up) {
+                        if (!recalcHeight(l.*) and !all_way_up) {
                             if (options.countChildren) {
-                                updateCounts(l);
+                                updateCounts(l.*);
                             }
                             return;
                         }
                         if (options.countChildren) {
-                            recalcCounts(l);
+                            recalcCounts(l.*);
                         }
                     },
                 }