neurocyte/cbor
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

refactor: thread a single allocator through json writing functions

Browse source
This commit is contained in:
CJ van den Berg 2026-03-12 20:45:24 +01:00
parent b28ef59477
commit 9461fea5a8
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/cbor.zig
View file

@ -1435,19 +1435,17 @@ pub fn writeJsonValue(writer: *Io.Writer, value: json.Value) !void {
}; };
} }
fn jsonScanUntil(writer: *Io.Writer, scanner: *json.Scanner, end_token: anytype) (JsonDecodeError || Io.Writer.Error)!usize { fn jsonScanUntil(writer: *Io.Writer, scanner: *json.Scanner, end_token: anytype, allocator: std.mem.Allocator) (JsonDecodeError || Io.Writer.Error)!usize {
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); var partial = std.array_list.Managed(u8).init(allocator);
defer arena.deinit(); defer partial.deinit();
var sfa = std.heap.stackFallback(1024, arena.allocator());
var partial = std.array_list.Managed(u8).init(sfa.get());
var count: usize = 0; var count: usize = 0;
var token = try scanner.next(); var token = try scanner.next();
while (token != end_token) : (token = try scanner.next()) { while (token != end_token) : (token = try scanner.next()) {
count += 1; count += 1;
switch (token) { switch (token) {
.object_begin => try writeJsonObject(writer, scanner), .object_begin => try writeJsonObject(writer, scanner, allocator),
.array_begin => try writeJsonArray(writer, scanner), .array_begin => try writeJsonArray(writer, scanner, allocator),
.true => try writeBool(writer, true), .true => try writeBool(writer, true),
.false => try writeBool(writer, false), .false => try writeBool(writer, false),
@ -1495,24 +1493,18 @@ fn jsonScanUntil(writer: *Io.Writer, scanner: *json.Scanner, end_token: anytype)
return count; return count;
} }
fn writeJsonArray(writer_: *Io.Writer, scanner: *json.Scanner) (JsonDecodeError || Io.Writer.Error)!void { fn writeJsonArray(writer_: *Io.Writer, scanner: *json.Scanner, allocator: std.mem.Allocator) (JsonDecodeError || Io.Writer.Error)!void {
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); var buf = Io.Writer.Allocating.init(allocator);
defer arena.deinit(); defer buf.deinit();
var sfa = std.heap.stackFallback(1024, arena.allocator()); const count = try jsonScanUntil(&buf.writer, scanner, .array_end, allocator);
var buf = Io.Writer.Allocating.init(sfa.get());
const writer = &buf.writer;
const count = try jsonScanUntil(writer, scanner, .array_end);
try writeArrayHeader(writer_, count); try writeArrayHeader(writer_, count);
try writer_.writeAll(buf.written()); try writer_.writeAll(buf.written());
} }
fn writeJsonObject(writer_: *Io.Writer, scanner: *json.Scanner) (JsonDecodeError || Io.Writer.Error)!void { fn writeJsonObject(writer_: *Io.Writer, scanner: *json.Scanner, allocator: std.mem.Allocator) (JsonDecodeError || Io.Writer.Error)!void {
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); var buf = Io.Writer.Allocating.init(allocator);
defer arena.deinit(); defer buf.deinit();
var sfa = std.heap.stackFallback(1024, arena.allocator()); const count = try jsonScanUntil(&buf.writer, scanner, .object_end, allocator);
var buf = Io.Writer.Allocating.init(sfa.get());
const writer = &buf.writer;
const count = try jsonScanUntil(writer, scanner, .object_end);
try writeMapHeader(writer_, count / 2); try writeMapHeader(writer_, count / 2);
try writer_.writeAll(buf.written()); try writer_.writeAll(buf.written());
} }
@ -1521,22 +1513,19 @@ pub fn fromJson(json_buf: []const u8, cbor_buf: []u8) (JsonDecodeError || Io.Wri
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena.deinit(); defer arena.deinit();
var sfa = std.heap.stackFallback(1024, arena.allocator()); var sfa = std.heap.stackFallback(1024, arena.allocator());
const allocator = sfa.get();
var writer: Io.Writer = .fixed(cbor_buf); var writer: Io.Writer = .fixed(cbor_buf);
var scanner = json.Scanner.initCompleteInput(allocator, json_buf);
var scanner = json.Scanner.initCompleteInput(sfa.get(), json_buf);
defer scanner.deinit(); defer scanner.deinit();
_ = try jsonScanUntil(&writer, &scanner, .end_of_document, allocator);
_ = try jsonScanUntil(&writer, &scanner, .end_of_document);
return writer.buffered(); return writer.buffered();
} }
pub fn fromJsonAlloc(a: std.mem.Allocator, json_buf: []const u8) JsonDecodeError![]const u8 { pub fn fromJsonAlloc(a: std.mem.Allocator, json_buf: []const u8) JsonDecodeError![]const u8 {
var stream: std.Io.Writer.Allocating = .init(a); var stream: std.Io.Writer.Allocating = .init(a);
defer stream.deinit(); defer stream.deinit();
var scanner = json.Scanner.initCompleteInput(a, json_buf); var scanner = json.Scanner.initCompleteInput(a, json_buf);
defer scanner.deinit(); defer scanner.deinit();
_ = try jsonScanUntil(&stream.writer, &scanner, .end_of_document, a);
_ = try jsonScanUntil(&stream.writer, &scanner, .end_of_document);
return stream.toOwnedSlice(); return stream.toOwnedSlice();
} }