summaryrefslogtreecommitdiff
path: root/src/Registers.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/Registers.zig')
-rw-r--r--src/Registers.zig27
1 files changed, 11 insertions, 16 deletions
diff --git a/src/Registers.zig b/src/Registers.zig
index 6df7401d..8019d9dc 100644
--- a/src/Registers.zig
+++ b/src/Registers.zig
@@ -57,20 +57,15 @@ pub fn value(r: *Registers, name: u21, i: usize) ?[]const u8 {
/// Store value `i` of `n`. `fresh` starts the register over with `n` empty
/// values; the replay across ranges passes it on its first pass only, so
/// every range fills its own slot.
-pub fn put(r: *Registers, gpa: std.mem.Allocator, name: u21, bytes: []const u8, i: usize, n: usize, fresh: bool) void {
- const copy = gpa.dupe(u8, bytes) catch return;
+pub fn put(r: *Registers, gpa: std.mem.Allocator, name: u21, bytes: []const u8, i: usize, n: usize, fresh: bool) error{OutOfMemory}!void {
+ const copy = try gpa.dupe(u8, bytes);
+ errdefer gpa.free(copy);
const reg = r.get(name) orelse blk: {
- r.list.append(gpa, .{ .name = name, .values = &.{} }) catch {
- gpa.free(copy);
- return;
- };
+ try r.list.append(gpa, .{ .name = name, .values = &.{} });
break :blk &r.list.items[r.list.items.len - 1];
};
// 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 values = try gpa.alloc([]u8, n);
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;
@@ -103,13 +98,13 @@ test "a register holds a value per range and joins them for one-text readers" {
defer r.deinit(gpa);
try std.testing.expect(r.value(default, 0) == null);
// a replay fills the last range first
- r.put(gpa, default, "two", 1, 2, true);
- r.put(gpa, default, "one\n", 0, 2, false);
+ try r.put(gpa, default, "two", 1, 2, true);
+ try r.put(gpa, default, "one\n", 0, 2, false);
try std.testing.expectEqualStrings("one\n", r.value(default, 0).?);
try std.testing.expectEqualStrings("two", r.value(default, 1).?);
try std.testing.expectEqualStrings("two", r.value(default, 5).?);
try std.testing.expectEqualStrings("one\ntwo", r.text(gpa, default).?);
- r.put(gpa, 'a', "x", 0, 1, true);
+ try r.put(gpa, 'a', "x", 0, 1, true);
try std.testing.expectEqualStrings("x", r.text(gpa, 'a').?);
try std.testing.expectEqualStrings("one\ntwo", r.text(gpa, default).?);
}
@@ -117,9 +112,9 @@ test "a register holds a value per range and joins them for one-text readers" {
test "joining a register that runs out of memory partway leaks nothing" {
var r: Registers = .{};
defer r.deinit(std.testing.allocator);
- r.put(std.testing.allocator, default, "one", 0, 2, true);
- r.put(std.testing.allocator, default, "two", 1, 2, false);
- r.put(std.testing.allocator, default, &(@as([4096]u8, @splat('x'))), 1, 2, false);
+ try r.put(std.testing.allocator, default, "one", 0, 2, true);
+ try r.put(std.testing.allocator, default, "two", 1, 2, false);
+ try r.put(std.testing.allocator, default, &(@as([4096]u8, @splat('x'))), 1, 2, false);
// The first append allocates; growing for the 4096 bytes fails.
var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{ .fail_index = 1, .resize_fail_index = 0 });
try std.testing.expect(r.text(failing.allocator(), default) == null);