summaryrefslogtreecommitdiff
path: root/src/Registers.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/Registers.zig')
-rw-r--r--src/Registers.zig38
1 files changed, 20 insertions, 18 deletions
diff --git a/src/Registers.zig b/src/Registers.zig
index 760aff9a..6df7401d 100644
--- a/src/Registers.zig
+++ b/src/Registers.zig
@@ -12,11 +12,12 @@ const Registers = @This();
list: std.ArrayList(Reg) = .empty,
last_search: u21 = '/',
-/// A value and the joined text are replaced whole, never written in place,
-/// so a replica's rollback copy pins them as it does a file's text
-/// (src/rollback.zig `pinned`), and they are freed raw: a safe build's
-/// free would write over one the copy still holds.
+/// The values (their array too) and the joined text are replaced whole,
+/// never written in place (`put` makes a new array), freed raw: blobs
+/// (src/walk.zig), which a digest hashes once and a replica's rollback copy
+/// pins as it does a file's text.
pub const Reg = struct {
+ pub const replica = .{ .blob = .{ "values", "joined" } };
name: u21,
/// gpa-owned, one per range, in document order
values: [][]u8,
@@ -36,7 +37,7 @@ pub fn deinit(r: *Registers, gpa: std.mem.Allocator) void {
fn freeReg(gpa: std.mem.Allocator, reg: *Reg) void {
for (reg.values) |v| freeRaw(gpa, v);
- gpa.free(reg.values);
+ freeRaw(gpa, reg.values);
if (reg.joined) |j| freeRaw(gpa, j);
}
@@ -65,19 +66,20 @@ pub fn put(r: *Registers, gpa: std.mem.Allocator, name: u21, bytes: []const u8,
};
break :blk &r.list.items[r.list.items.len - 1];
};
- if (fresh or reg.values.len != n) {
- const values = gpa.alloc([]u8, n) catch {
- gpa.free(copy);
- return;
- };
- for (values) |*v| v.* = &.{};
- freeReg(gpa, reg);
- reg.* = .{ .name = name, .values = values };
- }
- freeRaw(gpa, reg.values[i]);
- reg.values[i] = copy;
- if (reg.joined) |j| freeRaw(gpa, j);
- reg.joined = null;
+ // A new array, the old one's values moved into it but value `i`.
+ const values = gpa.alloc([]u8, n) catch {
+ gpa.free(copy);
+ return;
+ };
+ const keep = !fresh and reg.values.len == n;
+ for (values, 0..) |*v, j| v.* = if (keep and j != i) reg.values[j] else &.{};
+ values[i] = copy;
+ if (keep) {
+ freeRaw(gpa, reg.values[i]);
+ freeRaw(gpa, reg.values);
+ if (reg.joined) |j| freeRaw(gpa, j);
+ } else freeReg(gpa, reg);
+ reg.* = .{ .name = name, .values = values };
}
/// The whole register as one text: its values joined by newlines, no