Skip to content

Fix serialization of vectors bug #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gota7 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix serialization of vectors bug #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d047ab0
Fix serialization of vectors bug
Gota7 Dec 23, 2025
4e342a4
Produce and consume void values
Gota7 Dec 24, 2025
1e525cd
Allow writing enums and union tags
Gota7 Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Inspect.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ pub fn Inspect(comptime limits: ReadLimits) type {
.varIntBytes => try self.writeString(val.varIntBytes),
.smallBytes => try self.writeString(val.smallBytes),
.null => try w.writeAll("null"),
.void => try w.writeAll("void"),
.containerEnd => try w.writeAll("END"),
.smallIntPositive => try w.print("{d}", .{val.smallIntPositive}),
.smallIntNegative => try w.print("-{d}", .{val.smallIntNegative}),
Expand Down
45 changes: 24 additions & 21 deletions src/Reader.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ pub fn Reader(comptime limits: ReadLimits) type {
.bool => {
return .{ .bool = (decoded_tag.data != 0) };
},
.void => {
return .{ .void = undefined };
},
.varIntBytes => {
const len = try self.readBytesLength(.varIntBytes, decoded_tag.data);
if (len > self.bytes.len - self.pos) return error.UnexpectedEof;
Expand Down Expand Up @@ -325,7 +328,7 @@ pub fn Reader(comptime limits: ReadLimits) type {
.f16 => self.pos += 2,
.i16, .u16 => self.pos += 2,
.i8, .u8 => self.pos += 1,
.null, .bool => {},
.null, .bool, .void => {},
.smallIntPositive, .smallIntNegative, .smallUint => {},

// Variable length integers
Expand Down Expand Up @@ -532,11 +535,11 @@ pub fn Reader(comptime limits: ReadLimits) type {

const root_peek = try self.peekTag();

if (root_peek.tag != .object and root_peek.tag != .array) {
if (remaining > 0) {
var has_empty = false;
for (queries) |q| {
if (!q.resolved and q.path.len == 0) {
if (root_peek.tag != .object and root_peek.tag != .array) {
if (remaining > 0) {
var has_empty = false;
for (queries) |q| {
if (!q.resolved and q.path.len == 0) {
has_empty = true;
break;
}
Expand All @@ -551,8 +554,8 @@ pub fn Reader(comptime limits: ReadLimits) type {
remaining -= 1;
}
}
}
}
}

if (queries.len > 1) {
const LessIdx = struct {
Expand Down Expand Up @@ -878,20 +881,20 @@ pub fn Reader(comptime limits: ReadLimits) type {
const off = index * elem_size;
const chunk = ta.bytes[off..][0..elem_size];

return switch (ta.elem) {
.u8 => .{ .u8 = chunk[0] },
.i8 => .{ .i8 = @bitCast(chunk[0]) },
.u16 => .{ .u16 = std.mem.readInt(u16, chunk[0..2], .little) },
.i16 => .{ .i16 = std.mem.readInt(i16, chunk[0..2], .little) },
.u32 => .{ .u32 = std.mem.readInt(u32, chunk[0..4], .little) },
.i32 => .{ .i32 = std.mem.readInt(i32, chunk[0..4], .little) },
.u64 => .{ .u64 = std.mem.readInt(u64, chunk[0..8], .little) },
.i64 => .{ .i64 = std.mem.readInt(i64, chunk[0..8], .little) },
.f32 => .{ .f32 = @bitCast(std.mem.readInt(u32, chunk[0..4], .little)) },
.f64 => .{ .f64 = @bitCast(std.mem.readInt(u64, chunk[0..8], .little)) },
.f16 => .{ .f16 = @bitCast(std.mem.readInt(u16, chunk[0..2], .little)) },
};
}
return switch (ta.elem) {
.u8 => .{ .u8 = chunk[0] },
.i8 => .{ .i8 = @bitCast(chunk[0]) },
.u16 => .{ .u16 = std.mem.readInt(u16, chunk[0..2], .little) },
.i16 => .{ .i16 = std.mem.readInt(i16, chunk[0..2], .little) },
.u32 => .{ .u32 = std.mem.readInt(u32, chunk[0..4], .little) },
.i32 => .{ .i32 = std.mem.readInt(i32, chunk[0..4], .little) },
.u64 => .{ .u64 = std.mem.readInt(u64, chunk[0..8], .little) },
.i64 => .{ .i64 = std.mem.readInt(i64, chunk[0..8], .little) },
.f32 => .{ .f32 = @bitCast(std.mem.readInt(u32, chunk[0..4], .little)) },
.f64 => .{ .f64 = @bitCast(std.mem.readInt(u64, chunk[0..8], .little)) },
.f16 => .{ .f16 = @bitCast(std.mem.readInt(u16, chunk[0..2], .little)) },
};
}

/// Reads a value at a given path. Path format: "key", "key.nested", "array[0]", "obj.arr[2].name"
/// Returns null if the path doesn't exist or points to an incompatible type.
Expand Down
16 changes: 13 additions & 3 deletions src/Writer.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ pub fn write(self: *Writer, data: common.Value, comptime tag: std.meta.Tag(commo
.f64 => try w.writeInt(u64, @bitCast(data.f64), .little),
.f32 => try w.writeInt(u32, @bitCast(data.f32), .little),
.f16 => try w.writeInt(u16, @bitCast(data.f16), .little),
.object, .array, .containerEnd, .null => {},
.object, .array, .containerEnd, .null, .void => {},
.bytes => {
try w.writeInt(u64, data.bytes.len, .little);
try w.writeAll(data.bytes);
Expand Down Expand Up @@ -357,18 +357,28 @@ pub fn writeAnyExplicit(self: *Writer, comptime T: type, data: T) Error!void {
.vector => |vector_info| {
try self.startArray();
var i: usize = 0;
inline while (i < vector_info.len) : (i += 1) {
while (i < vector_info.len) : (i += 1) {
try self.writeAnyExplicit(@TypeOf(data[i]), data[i]);
}
try self.endContainer();
},
.@"enum" => |enum_info| {
inline for (enum_info.fields) |field| {
const field_tag = @field(T, field.name);
if (field_tag == data) {
try self.writeAnyExplicit(@TypeOf(field.name), field.name);
break;
}
}
},
.@"union" => |union_info| {
if (union_info.tag_type) |TT| {
const tag: TT = data;
inline for (union_info.fields) |field| {
const field_tag = @field(TT, field.name);
if (field_tag == tag) {
const field_value = @field(data, field.name);
try self.writeAnyExplicit(@TypeOf(field.name), field.name);
try self.writeAnyExplicit(@TypeOf(field_value), field_value);
break;
}
Expand All @@ -377,7 +387,7 @@ pub fn writeAnyExplicit(self: *Writer, comptime T: type, data: T) Error!void {
@compileError("bufzilla: untagged unions are not supported");
}
},
.void => {},
.void => try self.write(common.Value{ .void = undefined }, .void),
else => {
@compileError("bufzilla: unsupported data type: " ++ @typeName(T));
},
Expand Down
1 change: 1 addition & 0 deletions src/common.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ pub const Value = union(enum) {
// Simple types
bool: bool,
null: void,
void: void,

// Small signed integers where magnitude (0..7) is stored in the tag data bits.
// For negative small ints, magnitude 0 is invalid (no negative zero).
Expand Down