var -> anytype

This commit is contained in:
Robin Voetter
2020-07-12 14:13:13 +02:00
parent d18fe39488
commit 964ad1c0f9
5 changed files with 10 additions and 10 deletions

View File

@@ -4,5 +4,5 @@ pub const ShaderCompileStep = @import("build-integration.zig").ShaderCompileStep
test "main" { test "main" {
_ = @import("xml.zig"); _ = @import("xml.zig");
_ = @import("c-parse.zig"); _ = @import("vulkan/c-parse.zig");
} }

View File

@@ -540,7 +540,7 @@ pub fn parseVersion(xctok: *XmlCTokenizer) ![3][]const u8 {
return version; return version;
} }
fn testTokenizer(tokenizer: var, expected_tokens: []const Token) void { fn testTokenizer(tokenizer: anytype, expected_tokens: []const Token) void {
for (expected_tokens) |expected| { for (expected_tokens) |expected| {
const tok = (tokenizer.next() catch unreachable).?; const tok = (tokenizer.next() catch unreachable).?;
testing.expectEqual(expected.kind, tok.kind); testing.expectEqual(expected.kind, tok.kind);

View File

@@ -311,7 +311,7 @@ pub const Generator = struct {
try fixer_upper.fixup(); try fixer_upper.fixup();
} }
fn render(self: *Generator, out_stream: var) !void { fn render(self: *Generator, out_stream: anytype) !void {
try renderRegistry(out_stream, &self.reg_arena.allocator, &self.registry); try renderRegistry(out_stream, &self.reg_arena.allocator, &self.registry);
} }
}; };
@@ -320,7 +320,7 @@ pub const Generator = struct {
/// and the resulting binding is written to `writer`. `allocator` will be used to allocate temporary /// and the resulting binding is written to `writer`. `allocator` will be used to allocate temporary
/// internal datastructures - mostly via an ArenaAllocator, but sometimes a hashmap uses this allocator /// internal datastructures - mostly via an ArenaAllocator, but sometimes a hashmap uses this allocator
/// directly. /// directly.
pub fn generate(allocator: *Allocator, spec_xml: []const u8, writer: var) !void { pub fn generate(allocator: *Allocator, spec_xml: []const u8, writer: anytype) !void {
const spec = try xml.parse(allocator, spec_xml); const spec = try xml.parse(allocator, spec_xml);
defer spec.deinit(); defer spec.deinit();

View File

@@ -179,7 +179,7 @@ fn Renderer(comptime WriterType: type) type {
try self.id_renderer.renderWithCase(self.writer, case, id); try self.id_renderer.renderWithCase(self.writer, case, id);
} }
fn writeIdentifierFmt(self: *Self, comptime fmt: []const u8, args: var) !void { fn writeIdentifierFmt(self: *Self, comptime fmt: []const u8, args: anytype) !void {
try self.id_renderer.renderFmt(self.writer, fmt, args); try self.id_renderer.renderFmt(self.writer, fmt, args);
} }
@@ -1082,7 +1082,7 @@ fn Renderer(comptime WriterType: type) type {
}; };
} }
pub fn render(writer: var, allocator: *Allocator, registry: *const reg.Registry) !void { pub fn render(writer: anytype, allocator: *Allocator, registry: *const reg.Registry) !void {
var renderer = Renderer(@TypeOf(writer)).init(writer, allocator, registry); var renderer = Renderer(@TypeOf(writer)).init(writer, allocator, registry);
defer renderer.deinit(); defer renderer.deinit();
try renderer.render(); try renderer.render();

View File

@@ -50,7 +50,7 @@ pub fn needZigEscape(name: []const u8) bool {
or std.zig.Token.getKeyword(name) != null; or std.zig.Token.getKeyword(name) != null;
} }
pub fn writeIdentifier(out: var, id: []const u8) !void { pub fn writeIdentifier(out: anytype, id: []const u8) !void {
if (needZigEscape(id)) { if (needZigEscape(id)) {
try out.print("@\"{}\"", .{id}); try out.print("@\"{}\"", .{id});
} else { } else {
@@ -223,17 +223,17 @@ pub const IdRenderer = struct {
} }
} }
pub fn render(self: IdRenderer, out: var, id: []const u8) !void { pub fn render(self: IdRenderer, out: anytype, id: []const u8) !void {
try writeIdentifier(out, id); try writeIdentifier(out, id);
} }
pub fn renderFmt(self: *IdRenderer, out: var, comptime fmt: []const u8, args: var) !void { pub fn renderFmt(self: *IdRenderer, out: anytype, comptime fmt: []const u8, args: anytype) !void {
self.text_cache.items.len = 0; self.text_cache.items.len = 0;
try std.fmt.format(self.text_cache.writer(), fmt, args); try std.fmt.format(self.text_cache.writer(), fmt, args);
try writeIdentifier(out, self.text_cache.items); try writeIdentifier(out, self.text_cache.items);
} }
pub fn renderWithCase(self: *IdRenderer, out: var, case_style: CaseStyle, id: []const u8) !void { pub fn renderWithCase(self: *IdRenderer, out: anytype, case_style: CaseStyle, id: []const u8) !void {
const tag = getAuthorTag(id, self.tags); const tag = getAuthorTag(id, self.tags);
const adjusted_id = if (tag) |name| id[0 .. id.len - name.len] else id; const adjusted_id = if (tag) |name| id[0 .. id.len - name.len] else id;