Output syntactically correct zig

dpwm · Feb 25, 2025 · 940b6dc · 940b6dc
1 parent e530fc4
commit 940b6dc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/capnp.zig b/src/capnp.zig
@@ -226,6 +226,8 @@ pub const StructReader = struct {
         }
     }
 
+    pub fn readVoid(_: StructBuilder) void {}
+
     pub fn readStringField(self: StructReader, ptrNo: u16) Counter.Error![]u8 {
         return (try self.readPtrField(ListReader(u8), ptrNo)).getString();
     }
@@ -285,6 +287,8 @@ pub const StructBuilder = struct {
         return @bitCast(self.readIntField(U, offset));
     }
 
+    pub fn readVoid(_: StructBuilder) void {}
+
     pub fn writeFloatField(self: StructBuilder, comptime T: type, offset: u32, value: T) void {
         const U = comptime switch (T) {
             f32 => u32,

diff --git a/src/refactor.zig b/src/refactor.zig
@@ -250,6 +250,12 @@ pub fn Refactor(comptime W: type) type {
                 ctx.indenter.inc();
             }
 
+            pub fn openVoidSetter(ctx: *WriteContext, name: []const u8) E!void {
+                try ctx.writeIndent();
+                try ctx.writer.print("pub fn set{s}(self: @This()) void {{\n", .{capitalized(name)});
+                ctx.indenter.inc();
+            }
+
             pub fn closeGetter(ctx: *WriteContext) E!void {
                 ctx.indenter.dec();
                 try ctx.writeIndent();
@@ -433,7 +439,7 @@ pub fn Refactor(comptime W: type) type {
                     switch (t.which()) {
                         .void => {
                             {
-                                try ctx.writer.writeAll("return void{};\n");
+                                try ctx.writer.writeAll("return self.reader.readVoid();\n");
                             }
                         },
                         .bool => {
@@ -497,6 +503,12 @@ pub fn Refactor(comptime W: type) type {
                             try ctx.writeNodeNameById((try field.getSlot().?.getType()).getStruct().?.getTypeId());
                             try ctx.writer.print(", {d});\n", .{field.getSlot().?.getOffset()});
                         },
+                        .anyPointer => {
+                            switch (gt) {
+                                .reader => try ctx.writer.print("return self.reader.readAnyPointer({});\n", .{field.getSlot().?.getOffset()}),
+                                .builder => try ctx.writer.print("return self.builder.writeAnyPointer({});\n", .{field.getSlot().?.getOffset()}),
+                            }
+                        },
                         else => {},
                     }
                 },
@@ -527,9 +539,9 @@ pub fn Refactor(comptime W: type) type {
 
                     switch (t.which()) {
                         .void => {
-                            try ctx.openSetter(try field.getName(), "void", "void");
+                            try ctx.openVoidSetter(try field.getName());
                             try ctx.writeIndent();
-                            try ctx.writer.writeAll("return;\n");
+                            try ctx.writer.writeAll("_ = self; return;\n");
                             try ctx.closeSetter();
                         },
 
@@ -604,6 +616,13 @@ pub fn Refactor(comptime W: type) type {
                             try ctx.closeSetter();
                         },
 
+                        .anyPointer => {
+                            try ctx.openSetter(try field.getName(), "capnp.AnyPointerReader", "capnp.Error!void");
+                            try ctx.writeIndent();
+                            try ctx.writer.print("return self.builder.setAnyPointerField({d}, value);", .{field.getSlot().?.getOffset()});
+                            try ctx.closeSetter();
+                        },
+
                         else => {},
                     }
                 },