refactor: de-duplicate utf8_write_transform & utf8_partial_write_transform

This commit is contained in:
CJ van den Berg 2026-02-15 21:52:58 +01:00
parent 7471848ef2
commit a81f5c61d0
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9

View file

@ -112,8 +112,8 @@ pub const TransformError = error{
WriteFailed, WriteFailed,
}; };
fn utf8_write_transform(comptime field: uucode.FieldEnum, writer: *std.Io.Writer, text: []const u8) TransformError!void { fn utf8_write_transform_T(comptime View: anytype, comptime field: uucode.FieldEnum, writer: *std.Io.Writer, text: []const u8) TransformError!@typeInfo(@TypeOf(View.iterator)).@"fn".return_type.? {
const view: Utf8View = .initUnchecked(text); const view: View = .initUnchecked(text);
var it = view.iterator(); var it = view.iterator();
while (it.nextCodepoint()) |cp| { while (it.nextCodepoint()) |cp| {
const cp_ = switch (field) { const cp_ = switch (field) {
@ -125,21 +125,15 @@ fn utf8_write_transform(comptime field: uucode.FieldEnum, writer: *std.Io.Writer
const size = try utf8Encode(cp_, &utf8_buf); const size = try utf8Encode(cp_, &utf8_buf);
try writer.writeAll(utf8_buf[0..size]); try writer.writeAll(utf8_buf[0..size]);
} }
return it;
}
fn utf8_write_transform(comptime field: uucode.FieldEnum, writer: *std.Io.Writer, text: []const u8) TransformError!void {
_ = try utf8_write_transform_T(Utf8View, field, writer, text);
} }
fn utf8_partial_write_transform(comptime field: uucode.FieldEnum, writer: *std.Io.Writer, text: []const u8) TransformError![]const u8 { fn utf8_partial_write_transform(comptime field: uucode.FieldEnum, writer: *std.Io.Writer, text: []const u8) TransformError![]const u8 {
const view: Utf8PartialView = .initUnchecked(text); const it = try utf8_write_transform_T(Utf8PartialView, field, writer, text);
var it = view.iterator();
while (it.nextCodepoint()) |cp| {
const cp_ = switch (field) {
.simple_uppercase_mapping, .simple_lowercase_mapping => uucode.get(field, cp) orelse cp,
.case_folding_simple => uucode.get(field, cp),
else => @compileError(@tagName(field) ++ " is not a unicode transformation"),
};
var utf8_buf: [6]u8 = undefined;
const size = try utf8Encode(cp_, &utf8_buf);
try writer.writeAll(utf8_buf[0..size]);
}
return text[0..it.end]; return text[0..it.end];
} }