SPIR-V: Don't parse/render in gen_spirv_spec.zig, just emit in the right format

1 files changed, 16 insertions, 21 deletions

diff --git a/tools/gen_spirv_spec.zig b/tools/gen_spirv_spec.zig
index 2176d1fa5e..4e6d559c41 100644
--- a/tools/gen_spirv_spec.zig
+++ b/tools/gen_spirv_spec.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const g = @import("spirv/grammar.zig");
-const Writer = std.ArrayList(u8).Writer;
 
 pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
@@ -18,17 +17,12 @@ pub fn main() !void {
     var tokens = std.json.TokenStream.init(spec);
     var registry = try std.json.parse(g.Registry, &tokens, .{.allocator = allocator});
 
-    var buf = std.ArrayList(u8).init(allocator);
-    defer buf.deinit();
-
-    try render(buf.writer(), registry);
-
-    const tree = try std.zig.parse(allocator, buf.items);
-    const formatted = try tree.render(allocator);
-    try std.io.getStdOut().writeAll(formatted);
+    var bw = std.io.bufferedWriter(std.io.getStdOut().writer());
+    try render(bw.writer(), registry);
+    try bw.flush();
 }
 
-fn render(writer: Writer, registry: g.Registry) !void {
+fn render(writer: anytype, registry: g.Registry) !void {
     try writer.writeAll(
         \\//! This file is auto-generated by tools/gen_spirv_spec.zig.
         \\
@@ -39,7 +33,7 @@ fn render(writer: Writer, registry: g.Registry) !void {
     switch (registry) {
         .core => |core_reg| {
             try writer.print(
-                \\pub const version = Version{{.major = {}, .minor = {}, .patch = {}}};
+                \\pub const version = Version{{ .major = {}, .minor = {}, .patch = {} }};
                 \\pub const magic_number: u32 = {s};
                 \\
                 , .{ core_reg.major_version, core_reg.minor_version, core_reg.revision, core_reg.magic_number },
@@ -49,7 +43,7 @@ fn render(writer: Writer, registry: g.Registry) !void {
         },
         .extension => |ext_reg| {
             try writer.print(
-                \\pub const version = Version{{.major = {}, .minor = 0, .patch = {}}};
+                \\pub const version = Version{{ .major = {}, .minor = 0, .patch = {} }};
                 \\
                 , .{ ext_reg.version, ext_reg.revision },
             );
@@ -59,15 +53,15 @@ fn render(writer: Writer, registry: g.Registry) !void {
     }
 }
 
-fn renderOpcodes(writer: Writer, instructions: []const g.Instruction) !void {
+fn renderOpcodes(writer: anytype, instructions: []const g.Instruction) !void {
     try writer.writeAll("pub const Opcode = extern enum(u16) {\n");
     for (instructions) |instr| {
-        try writer.print("{} = {},\n", .{ std.zig.fmtId(instr.opname), instr.opcode });
+        try writer.print("    {} = {},\n", .{ std.zig.fmtId(instr.opname), instr.opcode });
     }
-    try writer.writeAll("_,\n};\n");
+    try writer.writeAll("    _,\n};\n");
 }
 
-fn renderOperandKinds(writer: Writer, kinds: []const g.OperandKind) !void {
+fn renderOperandKinds(writer: anytype, kinds: []const g.OperandKind) !void {
     for (kinds) |kind| {
         switch (kind.category) {
             .ValueEnum => try renderValueEnum(writer, kind),
@@ -77,20 +71,20 @@ fn renderOperandKinds(writer: Writer, kinds: []const g.OperandKind) !void {
     }
 }
 
-fn renderValueEnum(writer: Writer, enumeration: g.OperandKind) !void {
+fn renderValueEnum(writer: anytype, enumeration: g.OperandKind) !void {
     try writer.print("pub const {s} = extern enum(u32) {{\n", .{ enumeration.kind });
 
     const enumerants = enumeration.enumerants orelse return error.InvalidRegistry;
     for (enumerants) |enumerant| {
         if (enumerant.value != .int) return error.InvalidRegistry;
 
-        try writer.print("{} = {},\n", .{ std.zig.fmtId(enumerant.enumerant), enumerant.value.int });
+        try writer.print("    {} = {},\n", .{ std.zig.fmtId(enumerant.enumerant), enumerant.value.int });
     }
 
-    try writer.writeAll("_,\n};\n");
+    try writer.writeAll("    _,\n};\n");
 }
 
-fn renderBitEnum(writer: Writer, enumeration: g.OperandKind) !void {
+fn renderBitEnum(writer: anytype, enumeration: g.OperandKind) !void {
     try writer.print("pub const {s} = packed struct {{\n", .{ enumeration.kind });
 
     var flags_by_bitpos = [_]?[]const u8{null} ** 32;
@@ -113,6 +107,7 @@ fn renderBitEnum(writer: Writer, enumeration: g.OperandKind) !void {
     }
 
     for (flags_by_bitpos) |maybe_flag_name, bitpos| {
+        try writer.writeAll("    ");
         if (maybe_flag_name) |flag_name| {
             try writer.writeAll(flag_name);
         } else {
@@ -123,7 +118,7 @@ fn renderBitEnum(writer: Writer, enumeration: g.OperandKind) !void {
         if (bitpos == 0) { // Force alignment to integer boundaries
             try writer.writeAll("align(@alignOf(u32)) ");
         }
-        try writer.writeAll("= false, ");
+        try writer.writeAll("= false,\n");
     }
 
     try writer.writeAll("};\n");