| ... | @@ -40,7 +40,7 @@ pub fn compileInner(alloc: std.mem.Allocator, writer: anytype, comptime value: a | ... | @@ -40,7 +40,7 @@ pub fn compileInner(alloc: std.mem.Allocator, writer: anytype, comptime value: a |
| 40 | try do(alloc, writer, value, data, data, opts); | 40 | try do(alloc, writer, value, data, data, opts); |
| 41 | } | 41 | } |
| 42 | | 42 | |
| 43 | pub const Writer = std.ArrayList(u8).Writer; | 43 | pub const Writer = *std.Io.Writer; |
| 44 | | 44 | |
| 45 | fn do(alloc: std.mem.Allocator, writer: anytype, comptime value: astgen.Value, data: anytype, ctx: anytype, comptime opts: DoOptions) anyerror!void { | 45 | fn do(alloc: std.mem.Allocator, writer: anytype, comptime value: astgen.Value, data: anytype, ctx: anytype, comptime opts: DoOptions) anyerror!void { |
| 46 | comptime var skipindent = false; | 46 | comptime var skipindent = false; |
| ... | @@ -297,33 +297,33 @@ fn doInner(alloc: std.mem.Allocator, writer: anytype, comptime value: astgen.Val | ... | @@ -297,33 +297,33 @@ fn doInner(alloc: std.mem.Allocator, writer: anytype, comptime value: astgen.Val |
| 297 | .function => |v| { | 297 | .function => |v| { |
| 298 | if (!v.raw and @hasDecl(opts.Ctx, "pek_" ++ v.name)) { | 298 | if (!v.raw and @hasDecl(opts.Ctx, "pek_" ++ v.name)) { |
| 299 | const func = @field(opts.Ctx, "pek_" ++ v.name); | 299 | const func = @field(opts.Ctx, "pek_" ++ v.name); |
| 300 | var list = std.ArrayList(u8).init(alloc); | 300 | var list = std.Io.Writer.Allocating.init(alloc); |
| 301 | defer list.deinit(); | 301 | defer list.deinit(); |
| 302 | comptime var types: [v.args.len]type = @splat(void); | 302 | comptime var types: [v.args.len]type = @splat(void); |
| 303 | inline for (v.args, &types) |arg, *T| T.* = ResolveArg(arg, @TypeOf(data), @TypeOf(ctx)); | 303 | inline for (v.args, &types) |arg, *T| T.* = ResolveArg(arg, @TypeOf(data), @TypeOf(ctx)); |
| 304 | var args: std.meta.Tuple(&types) = undefined; | 304 | var args: std.meta.Tuple(&types) = undefined; |
| 305 | inline for (v.args, 0..) |arg, i| args[i] = try resolveArg(arg, alloc, data, ctx, opts); | 305 | inline for (v.args, 0..) |arg, i| args[i] = try resolveArg(arg, alloc, data, ctx, opts); |
| 306 | try @call(.auto, func, .{ alloc, list.writer() } ++ args); | 306 | try @call(.auto, func, .{ alloc, &list.writer } ++ args); |
| 307 | try writeReplacementString(writer, v.raw, opts.escaped, try list.toOwnedSlice()); | 307 | try writeReplacementString(writer, v.raw, opts.escaped, try list.toOwnedSlice()); |
| 308 | return; | 308 | return; |
| 309 | } | 309 | } |
| 310 | if (v.raw and @hasDecl(opts.Ctx, "pek__" ++ v.name)) { | 310 | if (v.raw and @hasDecl(opts.Ctx, "pek__" ++ v.name)) { |
| 311 | const func = @field(opts.Ctx, "pek__" ++ v.name); | 311 | const func = @field(opts.Ctx, "pek__" ++ v.name); |
| 312 | var list = std.ArrayList(u8).init(alloc); | 312 | var list = std.Io.Writer.Allocating.init(alloc); |
| 313 | defer list.deinit(); | 313 | defer list.deinit(); |
| 314 | const Tup = @typeInfo(@TypeOf(func)).@"fn".params[3].type.?; | 314 | const Tup = @typeInfo(@TypeOf(func)).@"fn".params[3].type.?; |
| 315 | if (@typeInfo(Tup).@"struct".fields.len == 0) { | 315 | if (@typeInfo(Tup).@"struct".fields.len == 0) { |
| 316 | // edge case branch because 'struct {}' is counted as a non-tuple | 316 | // edge case branch because 'struct {}' is counted as a non-tuple |
| 317 | try @call(.auto, func, .{ alloc, list.writer(), opts, Tup{} }); | 317 | try @call(.auto, func, .{ alloc, &list.writer, opts, Tup{} }); |
| 318 | try writeReplacementString(writer, v.raw, opts.escaped, list.items); | 318 | try writeReplacementString(writer, v.raw, opts.escaped, list.written()); |
| 319 | return; | 319 | return; |
| 320 | } | 320 | } |
| 321 | comptime var types: [v.args.len]type = @splat(void); | 321 | comptime var types: [v.args.len]type = @splat(void); |
| 322 | inline for (v.args, &types) |arg, *T| T.* = ResolveArg(arg, @TypeOf(data), @TypeOf(ctx)); | 322 | inline for (v.args, &types) |arg, *T| T.* = ResolveArg(arg, @TypeOf(data), @TypeOf(ctx)); |
| 323 | var args: std.meta.Tuple(&types) = undefined; | 323 | var args: std.meta.Tuple(&types) = undefined; |
| 324 | inline for (v.args, 0..) |arg, i| args[i] = try resolveArg(arg, alloc, data, ctx, opts); | 324 | inline for (v.args, 0..) |arg, i| args[i] = try resolveArg(arg, alloc, data, ctx, opts); |
| 325 | try @call(.auto, func, .{ alloc, list.writer(), opts, args }); | 325 | try @call(.auto, func, .{ alloc, &list.writer, opts, args }); |
| 326 | try writeReplacementString(writer, v.raw, opts.escaped, list.items); | 326 | try writeReplacementString(writer, v.raw, opts.escaped, list.written()); |
| 327 | return; | 327 | return; |
| 328 | } | 328 | } |
| 329 | if (v.raw and @hasDecl(opts.Ctx, "pek_" ++ v.name)) { | 329 | if (v.raw and @hasDecl(opts.Ctx, "pek_" ++ v.name)) { |
| ... | @@ -352,11 +352,11 @@ fn resolveArg(comptime arg: astgen.Arg, alloc: std.mem.Allocator, data: anytype, | ... | @@ -352,11 +352,11 @@ fn resolveArg(comptime arg: astgen.Arg, alloc: std.mem.Allocator, data: anytype, |
| 352 | .lookup => |av| search(av, ctx), | 352 | .lookup => |av| search(av, ctx), |
| 353 | .int => |av| av, | 353 | .int => |av| av, |
| 354 | .value => |av| { | 354 | .value => |av| { |
| 355 | var list = std.ArrayList(u8).init(alloc); | 355 | var list = std.Io.Writer.Allocating.init(alloc); |
| 356 | comptime var newopts = opts; | 356 | comptime var newopts = opts; |
| 357 | newopts.escaped = false; | 357 | newopts.escaped = false; |
| 358 | try do(alloc, list.writer(), astgen.Value{ .body = av }, data, ctx, newopts); | 358 | try do(alloc, &list.writer, astgen.Value{ .body = av }, data, ctx, newopts); |
| 359 | return list.items; | 359 | return list.written(); |
| 360 | }, | 360 | }, |
| 361 | }; | 361 | }; |
| 362 | } | 362 | } |
Meghan Denny <hello@nektro.net> 2026-05-31 23:43:43 -07:00
Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw