authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-04-19 20:44:18-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-04-19 20:44:18-04:00
loge74c5a7c244d26906a371d8d635a05d68f59ac3c
treedc2e36cb7277d2e9deb248c1080b88027cdffaa5
parent91ca0e4b02ff8f67e7e18a21fdcd1168f1f5a675

ir: nice rendering of string literal constants

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

src-self-hosted/ir.zig+23-5
......@@ -169,8 +169,9 @@ pub const Tree = struct {
169169 }
170170
171171 for (self.decls) |decl, i| {
172 try stream.print("@{} = ", .{i});
172 try stream.print("@{} ", .{i});
173173 try self.writeInstToStream(stream, decl, &inst_table);
174 try stream.writeByte('\n');
174175 }
175176 }
176177
......@@ -197,15 +198,26 @@ pub const Tree = struct {
197198 ) !void {
198199 const SpecificInst = Inst.TagToType(inst_tag);
199200 const inst = @fieldParentPtr(SpecificInst, "base", base);
201 if (@hasField(SpecificInst, "ty")) {
202 try stream.print(": {} ", .{inst.ty});
203 }
204 if (inst_tag == .constant) switch (inst.positionals.value.tag()) {
205 .bytes => {
206 try stream.writeAll("= ");
207 const bytes_value = inst.positionals.value.cast(Value.Payload.Bytes).?;
208 return std.zig.renderStringLiteral(bytes_value.data, stream);
209 },
210 else => {},
211 };
200212 const Positionals = @TypeOf(inst.positionals);
201 try stream.writeAll(@tagName(inst_tag) ++ "(");
213 try stream.writeAll("= " ++ @tagName(inst_tag) ++ "(");
202214 inline for (@typeInfo(Positionals).Struct.fields) |arg_field, i| {
203215 if (i != 0) {
204216 try stream.writeAll(", ");
205217 }
206218 try self.writeParamToStream(stream, @field(inst.positionals, arg_field.name), inst_table);
207219 }
208 try stream.writeAll(")\n");
220 try stream.writeByte(')');
209221 }
210222
211223 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 {
576588 bytes_payload.* = .{ .data = parsed };
577589
578590 const ty = opt_type orelse blk: {
579 const ty_payload = try ctx.allocator.create(Type.Payload.Array_u8_Sentinel0);
580 ty_payload.* = .{ .len = parsed.len };
591 const array_payload = try ctx.allocator.create(Type.Payload.Array_u8_Sentinel0);
592 errdefer ctx.allocator.destroy(array_payload);
593 array_payload.* = .{ .len = parsed.len };
594
595 const ty_payload = try ctx.allocator.create(Type.Payload.SingleConstPointer);
596 errdefer ctx.allocator.destroy(ty_payload);
597 ty_payload.* = .{ .pointee_type = Type.initPayload(&array_payload.base) };
598
581599 break :blk Type.initPayload(&ty_payload.base);
582600 };
583601
src-self-hosted/value.zig+1-1
......@@ -87,7 +87,7 @@ pub const Value = extern union {
8787 .int_i64 => return std.fmt.formatIntValue(self.cast(Payload.Int_i64).?.int, "", options, out_stream),
8888 .function => return out_stream.writeAll("(function)"),
8989 .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),
9191 }
9292 }
9393