From 5af6ffe864adecb45808a91d3f8124b7b4d4d6d1 Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sat, 20 Aug 2022 00:30:17 +0200
Subject: [PATCH] zig stage 2 compatibility

---
 generator/id_render.zig       | 5 ++---
 generator/vulkan/registry.zig | 4 ++--
 generator/vulkan/render.zig   | 2 +-
 generator/xml.zig             | 3 ++-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/generator/id_render.zig b/generator/id_render.zig
index 6c1b8af..ee5b960 100644
--- a/generator/id_render.zig
+++ b/generator/id_render.zig
@@ -142,7 +142,6 @@ pub const IdRenderer = struct {
     fn renderSnake(self: *IdRenderer, screaming: bool, id: []const u8, tag: ?[]const u8) !void {
         var it = SegmentIterator.init(id);
         var first = true;
-        const transform = if (screaming) std.ascii.toUpper else std.ascii.toLower;
 
         while (it.next()) |segment| {
             if (first) {
@@ -152,7 +151,7 @@ pub const IdRenderer = struct {
             }
 
             for (segment) |c| {
-                try self.text_cache.append(transform(c));
+                try self.text_cache.append(if (screaming) std.ascii.toUpper(c) else std.ascii.toLower(c));
             }
         }
 
@@ -160,7 +159,7 @@ pub const IdRenderer = struct {
             try self.text_cache.append('_');
 
             for (name) |c| {
-                try self.text_cache.append(transform(c));
+                try self.text_cache.append(if (screaming) std.ascii.toUpper(c) else std.ascii.toLower(c));
             }
         }
     }
diff --git a/generator/vulkan/registry.zig b/generator/vulkan/registry.zig
index eb0e494..70c779e 100644
--- a/generator/vulkan/registry.zig
+++ b/generator/vulkan/registry.zig
@@ -109,8 +109,8 @@ pub const Command = struct {
 
     params: []Param,
     return_type: *TypeInfo,
-    success_codes: [][]const u8,
-    error_codes: [][]const u8,
+    success_codes: []const []const u8,
+    error_codes: []const []const u8,
 };
 
 pub const Pointer = struct {
diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig
index 4168ca2..2b4a418 100644
--- a/generator/vulkan/render.zig
+++ b/generator/vulkan/render.zig
@@ -547,7 +547,7 @@ fn Renderer(comptime WriterType: type) type {
             if (optional) {
                 try self.writer.writeByte('?');
             }
-            try self.writer.writeAll("fn(");
+            try self.writer.writeAll("*const fn(");
             for (command_ptr.params) |param| {
                 try self.writeIdentifierWithCase(.snake, param.name);
                 try self.writer.writeAll(": ");
diff --git a/generator/xml.zig b/generator/xml.zig
index 01441d0..a925a8f 100644
--- a/generator/xml.zig
+++ b/generator/xml.zig
@@ -56,7 +56,8 @@ pub const Element = struct {
     }
 
     pub fn findChildByTag(self: Element, tag: []const u8) ?*Element {
-        return self.findChildrenByTag(tag).next();
+        var it = self.findChildrenByTag(tag);
+        return it.next();
     }
 
     pub fn findChildrenByTag(self: Element, tag: []const u8) FindChildrenByTagIterator {