Commit dd175e2928c99962b58c1c6725299b3a995900fb | zig

author	Jimmi Holst Christensen <jhc@dismail.de> 2022-11-19 10:54:43+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-01-09 14:29:59-07:00
log	dd175e2928c99962b58c1c6725299b3a995900fb
tree	dfd17baab0b521260ccf7558368df866430375c1
parent	90fedf24fcec4bd7a9e71be100e0ae73c7245b33

c backend: Output string literals for array init of bytes

1 files changed, 63 insertions(+), 24 deletions(-)

src
- codegen
  - c.zig

src/codegen/c.zig+63-24

 @@ -740,14 +740,24 @@ pub const DeclGen = struct {
                         try writer.writeByte(')');
                     }
-                    try writer.writeByte('{');
+                    const ai = ty.arrayInfo();
-                    const c_len = ty.arrayLenIncludingSentinel();
+                    if (ai.elem_type.eql(Type.u8, dg.module)) {
-                    var index: usize = 0;
+                        try writer.writeByte('"');
-                    while (index < c_len) : (index += 1) {
+                        const c_len = ty.arrayLenIncludingSentinel();
-                        if (index > 0) try writer.writeAll(", ");
+                        var index: usize = 0;
-                        try dg.renderValue(writer, ty.childType(), val, .Initializer);
+                        while (index < c_len) : (index += 1)
+                            try writeStringLiteralChar(writer, 0xaa);
+                        return writer.writeByte('"');
+                    } else {
+                        try writer.writeByte('{');
+                        const c_len = ty.arrayLenIncludingSentinel();
+                        var index: usize = 0;
+                        while (index < c_len) : (index += 1) {
+                            if (index > 0) try writer.writeAll(", ");
+                            try dg.renderValue(writer, ty.childType(), val, .Initializer);
+                        }
+                        return writer.writeByte('}');
                     }
-                    return writer.writeByte('}');
                 },
                 .ComptimeInt,
                 .ComptimeFloat,
 @@ -931,25 +941,48 @@ pub const DeclGen = struct {
                         }
                         try writer.writeByte('}');
                     },
+                    .bytes => {
+                        try writer.print("{s}", .{fmtStringLiteral(val.castTag(.bytes).?.data)});
+                    },
+                    .str_lit => {
+                        const str_lit = val.castTag(.str_lit).?.data;
+                        const bytes = dg.module.string_literal_bytes.items[str_lit.index..][0..str_lit.len];
+                        try writer.print("{s}", .{fmtStringLiteral(bytes)});
+                    },
                     else => {
                         // Fall back to generic implementation.
                         var arena = std.heap.ArenaAllocator.init(dg.gpa);
                         defer arena.deinit();
                         const arena_allocator = arena.allocator();
-                        try writer.writeByte('{');
                         const ai = ty.arrayInfo();
-                        var index: usize = 0;
+                        if (ai.elem_type.eql(Type.u8, dg.module)) {
-                        while (index < ai.len) : (index += 1) {
+                            try writer.writeByte('"');
-                            if (index != 0) try writer.writeByte(',');
+                            var index: usize = 0;
-                            const elem_val = try val.elemValue(dg.module, arena_allocator, index);
+                            while (index < ai.len) : (index += 1) {
-                            try dg.renderValue(writer, ai.elem_type, elem_val, .Initializer);
+                                const elem_val = try val.elemValue(dg.module, arena_allocator, index);
-                        }
+                                const elem_val_u8 = @intCast(u8, elem_val.toUnsignedInt(target));
-                        if (ai.sentinel) |s| {
+                                try writeStringLiteralChar(writer, elem_val_u8);
-                            if (index != 0) try writer.writeByte(',');
+                            }
-                            try dg.renderValue(writer, ai.elem_type, s, .Initializer);
+                            if (ai.sentinel) |s| {
+                                const s_u8 = @intCast(u8, s.toUnsignedInt(target));
+                                try writeStringLiteralChar(writer, s_u8);
+                            }
+                            try writer.writeByte('"');
+                        } else {
+                            try writer.writeByte('{');
+                            var index: usize = 0;
+                            while (index < ai.len) : (index += 1) {
+                                if (index != 0) try writer.writeByte(',');
+                                const elem_val = try val.elemValue(dg.module, arena_allocator, index);
+                                try dg.renderValue(writer, ai.elem_type, elem_val, .Initializer);
+                            }
+                            if (ai.sentinel) |s| {
+                                if (index != 0) try writer.writeByte(',');
+                                try dg.renderValue(writer, ai.elem_type, s, .Initializer);
+                            }
+                            try writer.writeByte('}');
                         }
-                        try writer.writeByte('}');
                     },
                 }
             },
 @@ -5618,7 +5651,17 @@ fn formatStringLiteral(
 ) @TypeOf(writer).Error!void {
     if (fmt.len != 1 or fmt[0] != 's') @compileError("Invalid fmt: " ++ fmt);
     try writer.writeByte('\"');
-    for (str) |c| switch (c) {
+    for (str) |c|
+        try writeStringLiteralChar(writer, c);
+    try writer.writeByte('\"');
+}
+fn fmtStringLiteral(str: []const u8) std.fmt.Formatter(formatStringLiteral) {
+    return .{ .data = str };
+}
+fn writeStringLiteralChar(writer: anytype, c: u8) !void {
+    switch (c) {
         7 => try writer.writeAll("\\a"),
         8 => try writer.writeAll("\\b"),
         '\t' => try writer.writeAll("\\t"),
 @@ -5631,11 +5674,7 @@ fn formatStringLiteral(
             ' '...'~' => try writer.writeByte(c),
             else => try writer.print("\\{o:0>3}", .{c}),
         },
-    };
+    }
-    try writer.writeByte('\"');
-}
-fn fmtStringLiteral(str: []const u8) std.fmt.Formatter(formatStringLiteral) {
-    return .{ .data = str };
 }
 fn undefPattern(comptime IntType: type) IntType {