Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ir: nice rendering of string literal constants

Browse Source
This commit is contained in:
Andrew Kelley 2020-04-19 20:44:18 -04:00
parent 91ca0e4b02
commit e74c5a7c24
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src-self-hosted/ir.zig
View File

@ -169,8 +169,9 @@ pub const Tree = struct {
} }
for (self.decls) |decl, i| { for (self.decls) |decl, i| {
try stream.print("@{} = ", .{i}); try stream.print("@{} ", .{i});
try self.writeInstToStream(stream, decl, &inst_table); try self.writeInstToStream(stream, decl, &inst_table);
try stream.writeByte('\n');
} }
} }
@ -197,15 +198,26 @@ pub const Tree = struct {
) !void { ) !void {
const SpecificInst = Inst.TagToType(inst_tag); const SpecificInst = Inst.TagToType(inst_tag);
const inst = @fieldParentPtr(SpecificInst, "base", base); 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); 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| { inline for (@typeInfo(Positionals).Struct.fields) |arg_field, i| {
if (i != 0) { if (i != 0) {
try stream.writeAll(", "); try stream.writeAll(", ");
} }
try self.writeParamToStream(stream, @field(inst.positionals, arg_field.name), inst_table); 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 { 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 }; bytes_payload.* = .{ .data = parsed };
const ty = opt_type orelse blk: { 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); break :blk Type.initPayload(&ty_payload.base);
}; };

2
src-self-hosted/value.zig
View File

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