add type for str, bin, array and map

Author: thislight

src/ComptimeFloat.zig

@@ -1,25 +1,21 @@
 const std = @import("std");
 const Float = @import("./root.zig").Float;
 
-pub fn countSm(value: comptime_int) usize {
-    return serializeSm(std.io.null_writer, value) catch unreachable;
+pub fn count(value: comptime_int) usize {
+    return pipe(std.io.null_writer, value) catch unreachable;
 }
 
-pub fn serializeSm(writer: anytype, value: comptime_int) !usize {
+pub fn pipe(writer: anytype, value: comptime_int) !usize {
     const wontLosePrecision = @as(f32, @floatCast(value)) == value;
 
     if (wontLosePrecision) {
-        return Float(f32).serialize(writer, @floatCast(value));
+        return Float(f32).pipe(writer, @floatCast(value));
     } else {
-        return Float(f64).serialize(writer, @floatCast(value));
+        return Float(f64).pipe(writer, @floatCast(value));
     }
 }
 
-pub fn writeSm(dst: []u8, value: comptime_float) usize {
+pub fn write(dst: []u8, value: comptime_float) usize {
     var stream = std.io.fixedBufferStream(dst);
-    return serializeSm(stream.writer(), value) catch unreachable;
+    return pipe(stream.writer(), value) catch unreachable;
 }
-
-pub const count = countSm;
-pub const serialize = serializeSm;
-pub const write = writeSm;

src/ComptimeInt.zig

@@ -16,9 +16,7 @@ pub fn count(value: comptime_int) usize {
     return 1 + nbytes;
 }
 
-pub const countSm = count;
-
-pub fn serialize(writer: anytype, value: comptime_int) !usize {
+pub fn pipe(writer: anytype, value: comptime_int) !usize {
     const signed: std.builtin.Signedness = if (value < 0) .signed else .unsigned;
     const bits = compatstd.meta.bitsOfNumber(value);
 
@@ -56,7 +54,5 @@ pub fn serialize(writer: anytype, value: comptime_int) !usize {
 
 pub fn write(dst: []u8, value: comptime_int) usize {
     var stream = std.io.fixedBufferStream(dst);
-    return serialize(stream.writer(), value) catch unreachable;
+    return pipe(stream.writer(), value) catch unreachable;
 }
-
-pub const writeSm = write;

src/io.zig

@@ -16,51 +16,6 @@ const comptimePrint = std.fmt.comptimePrint;
 const Allocator = std.mem.Allocator;
 const ArrayList = std.ArrayList;
 
-pub fn writeStringPrefix(writer: anytype, length: u32) !usize {
-    const header = fmt.prefixString(length);
-    return try writer.write(header.constSlice());
-}
-
-pub fn writeString(writer: anytype, src: []const u8) !usize {
-    const size1 = try writeStringPrefix(writer, @intCast(src.len));
-    const size2 = try writer.write(src);
-    return size1 + size2;
-}
-
-pub fn writeBinaryPrefix(writer: anytype, length: u32) !usize {
-    const header = fmt.prefixBinary(length);
-    return try writer.write(header.constSlice());
-}
-
-pub fn writeBinary(writer: anytype, src: []const u8) !usize {
-    const size1 = try writeBinaryPrefix(writer, @intCast(src.len));
-    const size2 = try writer.write(src);
-    return size1 + size2;
-}
-
-pub fn writeExtPrefix(writer: anytype, length: u32, extype: i8) !usize {
-    const header = fmt.prefixExt(length, extype);
-    return try writer.write(header.constSlice());
-}
-
-pub fn writeExt(writer: anytype, extype: i8, payload: []const u8) !usize {
-    const size1 = try writeExtPrefix(writer, @intCast(payload.len), extype);
-    const size2 = try writer.write(payload);
-    return size1 + size2;
-}
-
-pub fn writeArrayPrefix(writer: anytype, length: u32) !usize {
-    const prefix = fmt.prefixArray(length);
-    const slice = prefix.constSlice();
-    return try writer.write(slice);
-}
-
-pub fn writeMapPrefix(writer: anytype, length: u32) !usize {
-    const prefix = fmt.prefixMap(length);
-    const slice = prefix.constSlice();
-    return try writer.write(slice);
-}
-
 /// Wrapper to read value from a `std.io.GenericReader`.
 ///
 /// The usage is almost same to the `fmt.Unpack`, but you
@@ -266,7 +221,7 @@ pub const UnpackReader = struct {
         const t = std.testing;
 
         var content: std.BoundedArray(u8, fmt.PREFIX_BUFSIZE * 1 + "Hello".len) = .{};
-        _ = try writeString(content.writer(), "Hello");
+        _ = try fmt.AnyStr.pipeVal(content.writer(), "Hello");
         var stream = std.io.fixedBufferStream(content.constSlice());
 
         var buf: [256]u8 = undefined;
@@ -281,7 +236,7 @@ pub const UnpackReader = struct {
         const t = std.testing;
 
         var content: std.BoundedArray(u8, fmt.PREFIX_BUFSIZE * 1 + "Hello".len) = .{};
-        _ = try writeString(content.writer(), "Hello");
+        _ = try fmt.AnyStr.pipeVal(content.writer(), "Hello");
         var stream = std.io.fixedBufferStream(content.constSlice()[0 .. content.len - 1]);
 
         var buf: [256]u8 = undefined;

src/rewriter.zig

@@ -12,16 +12,16 @@ fn rewriteValue(
     switch (h.type.family()) {
         .nil => {
             _ = try values.nil(reader, ?*anyopaque, h);
-            _ = try zigpak.Nil.serialize(writer);
+            _ = try zigpak.Nil.pipe(writer);
         },
-        .bool => _ = try zigpak.Bool.serialize(writer, try values.bool(reader, h)),
-        .int => _ = try zigpak.SInt.serializeSm(writer, try values.int(reader, i64, h)),
-        .uint => _ = try zigpak.UInt.serializeSm(writer, try values.int(reader, u64, h)),
-        .float => _ = try zigpak.AnyFloat.serializeSm(writer, try values.float(reader, f64, h)),
+        .bool => _ = try zigpak.Bool.pipe(writer, try values.bool(reader, h)),
+        .int => _ = try zigpak.SInt.pipeSm(writer, try values.int(reader, i64, h)),
+        .uint => _ = try zigpak.UInt.pipeSm(writer, try values.int(reader, u64, h)),
+        .float => _ = try zigpak.AnyFloat.pipeSm(writer, try values.float(reader, f64, h)),
         .str => {
             var strReader = try values.rawReader(reader, h);
             var strbuf: [4096]u8 = undefined;
-            _ = try zigpak.io.writeStringPrefix(writer, h.size);
+            _ = try zigpak.AnyStr.pipe(writer, h.size);
             while (true) {
                 const readsize = try strReader.read(&strbuf);
                 if (readsize == 0) {
@@ -33,7 +33,7 @@ fn rewriteValue(
         .bin => {
             var strReader = try values.rawReader(reader, h);
             var strbuf: [4096]u8 = undefined;
-            _ = try zigpak.io.writeBinaryPrefix(writer, h.size);
+            _ = try zigpak.AnyBin.pipe(writer, h.size);
             while (true) {
                 const readsize = try strReader.read(&strbuf);
                 if (readsize == 0) {
@@ -44,14 +44,14 @@ fn rewriteValue(
         },
         .array => {
             var array = try values.array(h);
-            _ = try zigpak.io.writeArrayPrefix(writer, array.len);
+            _ = try zigpak.AnyArray.pipe(writer, array.len);
             while (try array.next(reader)) |elementh| {
                 try rewriteValue(reader, writer, values, elementh);
             }
         },
         .map => {
             var map = try values.map(h);
-            _ = try zigpak.io.writeMapPrefix(writer, map.len);
+            _ = try zigpak.AnyMap.pipe(writer, map.len);
             while (try map.next(reader)) |keyh| {
                 try rewriteValue(reader, writer, map.reader, keyh);
                 const valueh = try map.next(reader) orelse return error.InvalidValue;