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

fix(zig-0.16): BREAKING adapt to std.json.ObjectMap becoming unmanaged

Browse source 
Remove JsonObjectExtractor because extract(&obj) for ObjectMap cannot work
without a stored allocator

Migration: replace extract(&obj) with extractAlloc(&obj, allocator)
This commit is contained in:
CJ van den Berg 2026-04-15 11:42:26 +02:00
parent e21fa573c5
commit 50cb8cc9e9
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/cbor.zig
View file

@ -388,7 +388,7 @@ fn decodeJsonArray(iter_: *[]const u8, minor: u5, arr: *json.Array) Error!bool {
return true;
}
fn decodeJsonObject(iter_: *[]const u8, minor: u5, obj: *json.ObjectMap) Error!bool {
fn decodeJsonObject(iter_: *[]const u8, minor: u5, obj: *json.ObjectMap, allocator: std.mem.Allocator) Error!bool {
var iter = iter_.*;
var n = try decodePInt(&iter, minor);
while (n > 0) {
@ -397,10 +397,10 @@ fn decodeJsonObject(iter_: *[]const u8, minor: u5, obj: *json.ObjectMap) Error!b
if (!try matchString(&iter, &key))
return false;
if (!try matchJsonValue(&iter, &value, obj.allocator))
if (!try matchJsonValue(&iter, &value, allocator))
return false;
_ = try obj.getOrPutValue(key, value);
_ = try obj.getOrPutValue(allocator, key, value);
n -= 1;
}
iter_.* = iter;
@ -924,8 +924,8 @@ fn matchJsonValue(iter_: *[]const u8, v: *json.Value, a: std.mem.Allocator) Erro
break :ret try decodeJsonArray(&iter, t.minor, &v.array);
},
5 => ret: { // map
v.* = json.Value{ .object = json.ObjectMap.init(a) };
break :ret try decodeJsonObject(&iter, t.minor, &v.object);
v.* = json.Value{ .object = .empty };
break :ret try decodeJsonObject(&iter, t.minor, &v.object, a);
},
6 => ret: { // tag
break :ret false;
@ -1041,14 +1041,14 @@ fn matchArrayAlloc(iter: *[]const u8, element_type: type, arr: anytype, allocato
return true;
}
fn matchJsonObject(iter_: *[]const u8, obj: *json.ObjectMap) !bool {
fn matchJsonObject(iter_: *[]const u8, obj: *json.ObjectMap, allocator: std.mem.Allocator) !bool {
var iter = iter_.*;
const t = try decodeType(&iter);
if (t.type == cbor_magic_null)
return true;
if (t.major != 5)
return error.NotAnObject;
const ret = try decodeJsonObject(&iter, t.minor, obj);
const ret = try decodeJsonObject(&iter, t.minor, obj, allocator);
if (ret) iter_.* = iter;
return ret;
}
@ -1148,6 +1148,8 @@ fn GenericExtractorAlloc(T: type) type {
pub fn extract(self: Self, iter: *[]const u8) Error!bool {
if (comptime T == json.Value) {
return matchJsonValue(iter, self.dest, self.allocator);
} else if (comptime T == json.ObjectMap) {
return matchJsonObject(iter, self.dest, self.allocator);
} else if (comptime isExtractableAlloc(T)) {
return self.dest.cborExtract(iter, self.allocator);
} else {
@ -1209,26 +1211,11 @@ const JsonValueExtractor = struct {
}
};
const JsonObjectExtractor = struct {
dest: *T,
const Self = @This();
pub const EXTRACTOR_TAG = struct {};
const T = json.ObjectMap;
pub fn init(dest: *T) Self {
return .{ .dest = dest };
}
pub fn extract(self: Self, iter: *[]const u8) Error!bool {
return matchJsonObject(iter, self.dest);
}
};
fn Extractor(comptime T: type) type {
if (T == json.Value)
return JsonValueExtractor;
if (T == json.ObjectMap)
return JsonObjectExtractor;
return extractErrorAlloc(json.ObjectMap);
return struct {
dest: *T,
const Self = @This();

18
test/tests.zig
View file

@ -369,9 +369,9 @@ test "cbor.extract_map" {
var buf: [128]u8 = undefined;
const v = .{ "five", 5, "four", 4, .{ .three = 3 } };
const m = fmt(&buf, v);
var obj = std.json.ObjectMap.init(std.testing.allocator);
defer obj.deinit();
try expect(try match(m, .{ "five", 5, "four", 4, extract(&obj) }));
var obj: std.json.ObjectMap = .empty;
defer obj.deinit(std.testing.allocator);
try expect(try match(m, .{ "five", 5, "four", 4, extractAlloc(&obj, std.testing.allocator) }));
try expect(obj.contains("three"));
try expectEqual(obj.get("three").?, std.json.Value{ .integer = 3 });
}
@ -382,9 +382,9 @@ test "cbor.extract_map_map" {
const m = fmt(&buf, v);
var a = std.heap.ArenaAllocator.init(std.testing.allocator);
defer a.deinit();
var obj = std.json.ObjectMap.init(a.allocator());
defer obj.deinit();
try expect(try match(m, .{ "five", 5, "four", 4, extract(&obj) }));
var obj: std.json.ObjectMap = .empty;
defer obj.deinit(a.allocator());
try expect(try match(m, .{ "five", 5, "four", 4, extractAlloc(&obj, a.allocator()) }));
try expect(obj.contains("three"));
try expectEqual(obj.get("three").?, std.json.Value{ .integer = 3 });
var child = obj.get("child").?.object;
@ -734,9 +734,9 @@ test "cbor.writeJsonValue object" {
var writer: Io.Writer = .fixed(&buf);
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
defer arena.deinit();
var obj = std.json.ObjectMap.init(arena.allocator());
try obj.put("x", .{ .integer = 42 });
try obj.put("y", .{ .string = "hello" });
var obj: std.json.ObjectMap = .empty;
try obj.put(arena.allocator(), "x", .{ .integer = 42 });
try obj.put(arena.allocator(), "y", .{ .string = "hello" });
try writeJsonValue(&writer, .{ .object = obj });
var json_buf: [128]u8 = undefined;
try expectEqualStrings("{\"x\":42,\"y\":\"hello\"}", try toJson(writer.buffered(), &json_buf));