Commit 2b5e93fd3ea7ced934c7310ce68177738b1cdb81 | zig

author	data-man <datamanrb@gmail.com> 2020-10-31 15:12:05+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-01-02 17:12:57-07:00
log	2b5e93fd3ea7ced934c7310ce68177738b1cdb81
tree	c4641d356e9d65a255c7d25ca146ce3722f89425
parent	6f53653db17933fe2c8502d5bfc60857097b8bff

Add formatting for arrays

1 files changed, 28 insertions(+), 20 deletions(-)

lib
- std
  - fmt.zig

lib/std/fmt.zig+28-20

 @@ -483,13 +483,13 @@ pub fn formatType(
                 try format(writer, "@{x}", .{@ptrToInt(&value)});
             }
         },
-        .Struct => |StructT| {
+        .Struct => |info| {
             try writer.writeAll(@typeName(T));
             if (max_depth == 0) {
                 return writer.writeAll("{ ... }");
             }
             try writer.writeAll("{");
-            inline for (StructT.fields) |f, i| {
+            inline for (info.fields) |f, i| {
                 if (i == 0) {
                     try writer.writeAll(" .");
                 } else {
 @@ -526,10 +526,14 @@ pub fn formatType(
                 return format(writer, "{}@{x}", .{ @typeName(@typeInfo(T).Pointer.child), @ptrToInt(value) });
             },
             .Slice => {
+                if (max_depth == 0) {
+                    return writer.writeAll("[ ... ]");
+                }
                 if (ptr_info.child == u8) {
-                    return formatText(value, fmt, options, writer);
+                    if (fmt.len == 0 or fmt[0] == 's' or fmt[0] == 'x' or fmt[0] == 'X') {
+                        return formatText(value, fmt, options, writer);
+                    }
                 }
                 try writer.writeAll("[");
                 for (value) |elem, i| {
                     try formatType(elem, fmt, options, writer, max_depth);
 @@ -541,26 +545,29 @@ pub fn formatType(
             },
         },
         .Array => |info| {
-            const Slice = @Type(builtin.TypeInfo{
+            if (max_depth == 0) {
-                .Pointer = .{
+                return writer.writeAll("{ ... }");
-                    .size = .Slice,
+            }
-                    .is_const = true,
+            if (info.child == u8) {
-                    .is_volatile = false,
+                if (fmt.len > 0 and comptime mem.indexOfScalar(u8, "sxXeEzZ", fmt[0]) != null) {
-                    .is_allowzero = false,
+                    return formatText(&value, fmt, options, writer);
-                    .alignment = @alignOf(info.child),
+                }
-                    .child = info.child,
+            }
-                    .sentinel = null,
+            try writer.writeAll("{ ");
-                },
+            for (value) |elem, i| {
-            });
+                try formatType(elem, fmt, options, writer, max_depth - 1);
-            return formatType(@as(Slice, &value), fmt, options, writer, max_depth);
+                if (i < value.len - 1) {
+                    try writer.writeAll(", ");
+                }
+            }
+            try writer.writeAll(" }");
         },
-        .Vector => {
+        .Vector => |info| {
-            const len = @typeInfo(T).Vector.len;
             try writer.writeAll("{ ");
             var i: usize = 0;
-            while (i < len) : (i += 1) {
+            while (i < info.len) : (i += 1) {
                 try formatValue(value[i], fmt, options, writer);
-                if (i < len - 1) {
+                if (i < info.len - 1) {
                     try writer.writeAll(", ");
                 }
             }
 @@ -1555,6 +1562,7 @@ test "array" {
         const value: [3]u8 = "abc".*;
         try testFmt("array: abc\n", "array: {}\n", .{value});
         try testFmt("array: abc\n", "array: {}\n", .{&value});
+        try testFmt("array: { 97, 98, 99 }\n", "array: {d}\n", .{value});
         var buf: [100]u8 = undefined;
         try testFmt(