mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-15 02:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced setTag hack in Deserialize with @unionInit

Browse Source
This commit is contained in:
tgschultz 2019-10-15 19:29:47 +00:00 committed by Andrew Kelley
parent 9050cd847a
commit 6a629d3a9f
1 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/std/io.zig
View File

@ -1022,33 +1022,6 @@ pub fn Deserializer(comptime endian: builtin.Endian, comptime packing: Packing,
return @bitCast(T, result); return @bitCast(T, result);
} }
//@TODO: Replace this with @unionInit or whatever when it is added
// see: #1315
fn setTag(ptr: var, tag: var) void {
const T = @typeOf(ptr);
comptime assert(trait.isPtrTo(builtin.TypeId.Union)(T));
const U = meta.Child(T);
const info = @typeInfo(U).Union;
if (info.tag_type) |TagType| {
comptime assert(TagType == @typeOf(tag));
var ptr_tag = ptr: {
if (@alignOf(TagType) >= @alignOf(U)) break :ptr @ptrCast(*TagType, ptr);
const offset = comptime max: {
var max_field_size: comptime_int = 0;
for (info.fields) |field_info| {
const field_size = @sizeOf(field_info.field_type);
max_field_size = math.max(max_field_size, field_size);
}
break :max math.max(max_field_size, @alignOf(U));
};
break :ptr @intToPtr(*TagType, @ptrToInt(ptr) + offset);
};
ptr_tag.* = tag;
}
}
/// Deserializes and returns data of the specified type from the stream /// Deserializes and returns data of the specified type from the stream
pub fn deserialize(self: *Self, comptime T: type) !T { pub fn deserialize(self: *Self, comptime T: type) !T {
var value: T = undefined; var value: T = undefined;
@ -1112,17 +1085,11 @@ pub fn Deserializer(comptime endian: builtin.Endian, comptime packing: Packing,
const TagInt = @TagType(TagType); const TagInt = @TagType(TagType);
const tag = try self.deserializeInt(TagInt); const tag = try self.deserializeInt(TagInt);
{
@setRuntimeSafety(false);
//See: #1315
setTag(ptr, @intToEnum(TagType, tag));
}
inline for (info.fields) |field_info| { inline for (info.fields) |field_info| {
if (field_info.enum_field.?.value == tag) { if (field_info.enum_field.?.value == tag) {
const name = field_info.name; const name = field_info.name;
const FieldType = field_info.field_type; const FieldType = field_info.field_type;
@field(ptr, name) = FieldType(undefined); ptr.* = @unionInit(C, name, undefined);
try self.deserializeInto(&@field(ptr, name)); try self.deserializeInto(&@field(ptr, name));
return; return;
} }