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

Parse enum aliases

Browse Source
This commit is contained in:
Robin Voetter
2020-06-16 14:42:08 +02:00
parent 10d0b3bfcf
commit a6db3db211
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
generator/main.zig
View File

@@ -139,5 +139,4 @@ test "main" {
_ = @import("registry/c-parse.zig"); _ = @import("registry/c-parse.zig");
} }
// TODO: Fix not all enums being parsed.
// TODO: Fix not all struct fields being marked as optional properly. // TODO: Fix not all struct fields being marked as optional properly.

16
generator/registry/parse.zig
View File

@@ -60,8 +60,6 @@ fn parseTypes(allocator: *Allocator, out: []registry.Declaration, types_elem: *x
break :blk try parseForeigntype(ty); break :blk try parseForeigntype(ty);
}; };
// Enums are handled later, in parseEnums. This also has the effect of filtering
// out any enums which have no elements, and should be unused by other parts of the API.
if (mem.eql(u8, category, "bitmask")) { if (mem.eql(u8, category, "bitmask")) {
break :blk try parseBitmaskType(ty); break :blk try parseBitmaskType(ty);
} else if (mem.eql(u8, category, "handle")) { } else if (mem.eql(u8, category, "handle")) {
@@ -74,6 +72,8 @@ fn parseTypes(allocator: *Allocator, out: []registry.Declaration, types_elem: *x
break :blk try parseContainer(allocator, ty, true); break :blk try parseContainer(allocator, ty, true);
} else if (mem.eql(u8, category, "funcpointer")) { } else if (mem.eql(u8, category, "funcpointer")) {
break :blk try parseFuncPointer(allocator, ty); break :blk try parseFuncPointer(allocator, ty);
} else if (mem.eql(u8, category, "enum")) {
break :blk (try parseEnumAlias(allocator, ty)) orelse continue;
} }
continue; continue;
@@ -234,6 +234,18 @@ fn parsePointerMeta(type_info: *registry.TypeInfo, elem: *xml.Element) !void {
} }
} }
fn parseEnumAlias(allocator: *Allocator, elem: *xml.Element) !?registry.Declaration {
if (elem.getAttribute("alias")) |alias| {
const name = elem.getAttribute("name") orelse return error.InvalidRegistry;
return registry.Declaration{
.name = name,
.decl_type = .{.alias = .{.name = alias, .target = .other_type}},
};
}
return null;
}
fn parseEnums(allocator: *Allocator, out: []registry.Declaration, root: *xml.Element) !usize { fn parseEnums(allocator: *Allocator, out: []registry.Declaration, root: *xml.Element) !usize {
var i: usize = 0; var i: usize = 0;
var it = root.findChildrenByTag("enums"); var it = root.findChildrenByTag("enums");