allemang.d/vulkan-zig
1
0
Fork 0
forked from mirror/vulkan-zig
Code Pull Requests Activity

Merge pull request #101 from lefp/fix_optional_conflict

Browse Source 
Fix `optional` detection conflict
This commit is contained in:
Robin Voetter
2023-07-24 10:39:09 +02:00
committed by GitHub
parent 9743c9b1d3 f172cbbd7d
commit 4156f738f0
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
generator/vulkan/parse.zig
View File

@@ -300,6 +300,9 @@ fn lenToPointer(fields: Fields, len: []const u8) std.meta.Tuple(&.{ registry.Poi
} }
fn parsePointerMeta(fields: Fields, type_info: *registry.TypeInfo, elem: *xml.Element) !void { fn parsePointerMeta(fields: Fields, type_info: *registry.TypeInfo, elem: *xml.Element) !void {
var len_attribute_depth: usize = 0;
if (elem.getAttribute("len")) |lens| { if (elem.getAttribute("len")) |lens| {
var it = mem.split(u8, lens, ","); var it = mem.split(u8, lens, ",");
var current_type_info = type_info; var current_type_info = type_info;
@@ -311,7 +314,9 @@ fn parsePointerMeta(fields: Fields, type_info: *registry.TypeInfo, elem: *xml.El
break :blk size_optional[0]; break :blk size_optional[0];
} else .many; } else .many;
current_type_info.pointer.size = size; current_type_info.pointer.size = size;
current_type_info = current_type_info.pointer.child; current_type_info = current_type_info.pointer.child;
len_attribute_depth += 1;
} }
if (it.next()) |_| { if (it.next()) |_| {
@@ -322,18 +327,30 @@ fn parsePointerMeta(fields: Fields, type_info: *registry.TypeInfo, elem: *xml.El
} }
} }
var current_depth: usize = 0;
if (elem.getAttribute("optional")) |optionals| { if (elem.getAttribute("optional")) |optionals| {
var it = mem.split(u8, optionals, ","); var it = mem.split(u8, optionals, ",");
var current_type_info = type_info; var current_type_info = type_info;
while (current_type_info.* == .pointer) { while (current_type_info.* == .pointer) {
if (it.next()) |current_optional| { if (it.next()) |optional_str| {
current_type_info.pointer.is_optional = mem.eql(u8, current_optional, "true");
// The pointer may have already been marked as optional due to its `len` attribute.
var is_already_optional = false;
if (current_depth < len_attribute_depth)
is_already_optional = current_type_info.pointer.is_optional;
current_type_info.pointer.is_optional =
is_already_optional or mem.eql(u8, optional_str, "true");
} else { } else {
// There is no information for this pointer, probably incorrect. // There is no information for this pointer, probably incorrect.
return error.InvalidRegistry; return error.InvalidRegistry;
} }
current_type_info = current_type_info.pointer.child; current_type_info = current_type_info.pointer.child;
current_depth += 1;
} }
} }
} }