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

improve xml parser

Browse Source
This commit is contained in:
Robin Voetter
2022-06-25 11:16:05 +02:00
parent f6f5f66f20
commit cc87740422
5 changed files with 261 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generator/vulkan/c_parse.zig
View File

@@ -164,11 +164,11 @@ pub const XmlCTokenizer = struct {
}
fn elemToToken(elem: *xml.Element) !?Token {
if (elem.children.items.len != 1 or elem.children.items[0] != .CharData) {
if (elem.children.len != 1 or elem.children[0] != .char_data) {
return error.InvalidXml;
}
const text = elem.children.items[0].CharData;
const text = elem.children[0].char_data;
if (mem.eql(u8, elem.tag, "type")) {
return Token{ .kind = .type_name, .text = text };
} else if (mem.eql(u8, elem.tag, "enum")) {
@@ -203,9 +203,9 @@ pub const XmlCTokenizer = struct {
if (self.it.next()) |child| {
switch (child.*) {
.CharData => |cdata| self.ctok = CTokenizer{ .source = cdata, .in_comment = in_comment },
.Comment => {}, // xml comment
.Element => |elem| if (!in_comment) if (try elemToToken(elem)) |tok| return tok,
.char_data => |cdata| self.ctok = CTokenizer{ .source = cdata, .in_comment = in_comment },
.comment => {}, // xml comment
.element => |elem| if (!in_comment) if (try elemToToken(elem)) |tok| return tok,
}
} else {
return null;

21
generator/vulkan/parse.zig
View File

@@ -24,7 +24,6 @@ pub fn parseXml(backing_allocator: Allocator, root: *xml.Element) !ParseResult {
const allocator = arena.allocator();
var reg = registry.Registry{
.copyright = root.getCharData("comment") orelse return error.InvalidRegistry,
.decls = try parseDeclarations(allocator, root),
.api_constants = try parseApiConstants(allocator, root),
.tags = try parseTags(allocator, root),
@@ -42,7 +41,7 @@ fn parseDeclarations(allocator: Allocator, root: *xml.Element) ![]registry.Decla
var types_elem = root.findChildByTag("types") orelse return error.InvalidRegistry;
var commands_elem = root.findChildByTag("commands") orelse return error.InvalidRegistry;
const decl_upper_bound = types_elem.children.items.len + commands_elem.children.items.len;
const decl_upper_bound = types_elem.children.len + commands_elem.children.len;
const decls = try allocator.alloc(registry.Declaration, decl_upper_bound);
var count: usize = 0;
@@ -186,7 +185,7 @@ fn parseContainer(allocator: Allocator, ty: *xml.Element, is_union: bool) !regis
};
}
var members = try allocator.alloc(registry.Container.Field, ty.children.items.len);
var members = try allocator.alloc(registry.Container.Field, ty.children.len);
var i: usize = 0;
var it = ty.findChildrenByTag("member");
@@ -356,7 +355,7 @@ fn parseEnumFields(allocator: Allocator, elem: *xml.Element) !registry.Enum {
else
32;
const fields = try allocator.alloc(registry.Enum.Field, elem.children.items.len);
const fields = try allocator.alloc(registry.Enum.Field, elem.children.len);
var i: usize = 0;
var it = elem.findChildrenByTag("enum");
@@ -451,7 +450,7 @@ fn parseCommand(allocator: Allocator, elem: *xml.Element) !registry.Declaration
var proto_xctok = cparse.XmlCTokenizer.init(proto);
const command_decl = try cparse.parseParamOrProto(allocator, &proto_xctok, false);
var params = try allocator.alloc(registry.Command.Param, elem.children.items.len);
var params = try allocator.alloc(registry.Command.Param, elem.children.len);
var i: usize = 0;
var it = elem.findChildrenByTag("param");
@@ -527,7 +526,7 @@ fn parseApiConstants(allocator: Allocator, root: *xml.Element) ![]registry.ApiCo
break :blk n_defines;
};
const constants = try allocator.alloc(registry.ApiConstant, enums.children.items.len + n_defines);
const constants = try allocator.alloc(registry.ApiConstant, enums.children.len + n_defines);
var i: usize = 0;
var it = enums.findChildrenByTag("enum");
@@ -564,7 +563,7 @@ fn parseDefines(types: *xml.Element, out: []registry.ApiConstant) !usize {
if (mem.eql(u8, name, "VK_HEADER_VERSION")) {
out[i] = .{
.name = name,
.value = .{ .expr = mem.trim(u8, ty.children.items[2].CharData, " ") },
.value = .{ .expr = mem.trim(u8, ty.children[2].char_data, " ") },
};
} else {
var xctok = cparse.XmlCTokenizer.init(ty);
@@ -581,7 +580,7 @@ fn parseDefines(types: *xml.Element, out: []registry.ApiConstant) !usize {
fn parseTags(allocator: Allocator, root: *xml.Element) ![]registry.Tag {
var tags_elem = root.findChildByTag("tags") orelse return error.InvalidRegistry;
const tags = try allocator.alloc(registry.Tag, tags_elem.children.items.len);
const tags = try allocator.alloc(registry.Tag, tags_elem.children.len);
var i: usize = 0;
var it = tags_elem.findChildrenByTag("tag");
@@ -620,7 +619,7 @@ fn parseFeature(allocator: Allocator, feature: *xml.Element) !registry.Feature {
break :blk try splitFeatureLevel(number, ".");
};
var requires = try allocator.alloc(registry.Require, feature.children.items.len);
var requires = try allocator.alloc(registry.Require, feature.children.len);
var i: usize = 0;
var it = feature.findChildrenByTag("require");
while (it.next()) |require| {
@@ -745,7 +744,7 @@ fn parseRequire(allocator: Allocator, require: *xml.Element, extnumber: ?u31) !r
fn parseExtensions(allocator: Allocator, root: *xml.Element) ![]registry.Extension {
const extensions_elem = root.findChildByTag("extensions") orelse return error.InvalidRegistry;
const extensions = try allocator.alloc(registry.Extension, extensions_elem.children.items.len);
const extensions = try allocator.alloc(registry.Extension, extensions_elem.children.len);
var i: usize = 0;
var it = extensions_elem.findChildrenByTag("extension");
while (it.next()) |extension| {
@@ -823,7 +822,7 @@ fn parseExtension(allocator: Allocator, extension: *xml.Element) !registry.Exten
break :blk try splitCommaAlloc(allocator, requires_str);
};
var requires = try allocator.alloc(registry.Require, extension.children.items.len);
var requires = try allocator.alloc(registry.Require, extension.children.len);
var i: usize = 0;
var it = extension.findChildrenByTag("require");
while (it.next()) |require| {

1
generator/vulkan/registry.zig
View File

@@ -1,5 +1,4 @@
pub const Registry = struct {
copyright: []const u8,
decls: []Declaration,
api_constants: []ApiConstant,
tags: []Tag,