Commit e74c5a7c244d26906a371d8d635a05d68f59ac3c | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-04-19 20:44:18-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-04-19 20:44:18-04:00
log	e74c5a7c244d26906a371d8d635a05d68f59ac3c
tree	dc2e36cb7277d2e9deb248c1080b88027cdffaa5
parent	91ca0e4b02ff8f67e7e18a21fdcd1168f1f5a675

ir: nice rendering of string literal constants

2 files changed, 24 insertions(+), 6 deletions(-)

src-self-hosted
- ir.zig
- value.zig

src-self-hosted/ir.zig+23-5

 @@ -169,8 +169,9 @@ pub const Tree = struct {
         }
         for (self.decls) |decl, i| {
-            try stream.print("@{} = ", .{i});
+            try stream.print("@{} ", .{i});
             try self.writeInstToStream(stream, decl, &inst_table);
+            try stream.writeByte('\n');
         }
     }
 @@ -197,15 +198,26 @@ pub const Tree = struct {
     ) !void {
         const SpecificInst = Inst.TagToType(inst_tag);
         const inst = @fieldParentPtr(SpecificInst, "base", base);
+        if (@hasField(SpecificInst, "ty")) {
+            try stream.print(": {} ", .{inst.ty});
+        }
+        if (inst_tag == .constant) switch (inst.positionals.value.tag()) {
+            .bytes => {
+                try stream.writeAll("= ");
+                const bytes_value = inst.positionals.value.cast(Value.Payload.Bytes).?;
+                return std.zig.renderStringLiteral(bytes_value.data, stream);
+            },
+            else => {},
+        };
         const Positionals = @TypeOf(inst.positionals);
-        try stream.writeAll(@tagName(inst_tag) ++ "(");
+        try stream.writeAll("= " ++ @tagName(inst_tag) ++ "(");
         inline for (@typeInfo(Positionals).Struct.fields) |arg_field, i| {
             if (i != 0) {
                 try stream.writeAll(", ");
             }
             try self.writeParamToStream(stream, @field(inst.positionals, arg_field.name), inst_table);
         }
-        try stream.writeAll(")\n");
+        try stream.writeByte(')');
     }
     pub fn writeParamToStream(self: Tree, stream: var, param: var, inst_table: *const InstPtrTable) !void {
 @@ -576,8 +588,14 @@ fn parseStringLiteralConst(ctx: *ParseContext, opt_type: ?Type) !*Inst {
             bytes_payload.* = .{ .data = parsed };
             const ty = opt_type orelse blk: {
-                const ty_payload = try ctx.allocator.create(Type.Payload.Array_u8_Sentinel0);
+                const array_payload = try ctx.allocator.create(Type.Payload.Array_u8_Sentinel0);
-                ty_payload.* = .{ .len = parsed.len };
+                errdefer ctx.allocator.destroy(array_payload);
+                array_payload.* = .{ .len = parsed.len };
+                const ty_payload = try ctx.allocator.create(Type.Payload.SingleConstPointer);
+                errdefer ctx.allocator.destroy(ty_payload);
+                ty_payload.* = .{ .pointee_type = Type.initPayload(&array_payload.base) };
                 break :blk Type.initPayload(&ty_payload.base);
             };

src-self-hosted/value.zig+1-1

...	@@ -87,7 +87,7 @@ pub const Value = extern union {	...	@@ -87,7 +87,7 @@ pub const Value = extern union {
87	.int_i64 => return std.fmt.formatIntValue(self.cast(Payload.Int_i64).?.int, "", options, out_stream),	87	.int_i64 => return std.fmt.formatIntValue(self.cast(Payload.Int_i64).?.int, "", options, out_stream),
88	.function => return out_stream.writeAll("(function)"),	88	.function => return out_stream.writeAll("(function)"),
89	.ref => return out_stream.writeAll("(ref)"),	89	.ref => return out_stream.writeAll("(ref)"),
90	.bytes => return out_stream.writeAll("(bytes)"),	90	.bytes => return std.zig.renderStringLiteral(self.cast(Payload.Bytes).?.data, out_stream),
91	}	91	}
92	}	92	}
93		93