summaryrefslogtreecommitdiff
path: root/src/dump.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/dump.zig')
-rw-r--r--src/dump.zig24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/dump.zig b/src/dump.zig
index 402918c4..545d09ec 100644
--- a/src/dump.zig
+++ b/src/dump.zig
@@ -421,9 +421,9 @@ pub const Parsed = struct {
pub fn check(gpa: std.mem.Allocator, bytes: []const u8, why: []u8) !void {
var arena: std.heap.ArenaAllocator = .init(gpa);
defer arena.deinit();
- const source = try arena.allocator().dupeZ(u8, bytes);
- var diag: std.zon.parse.Diagnostics = .{};
- const state = std.zon.parse.fromSliceAlloc(State, arena.allocator(), source, &diag, .{ .free_on_error = false }) catch |err| {
+ const source = try arena.allocator().dupeSentinel(u8, bytes, 0);
+ var diag: std.zon.parse.Diagnostics = undefined;
+ const state = std.zon.parse.fromSlice(State, .{ .gpa = gpa, .arena = arena.allocator(), .source = source, .diagnostics = &diag }) catch |err| {
const said = pardes.Messages.zonWhy(&diag, why[0 .. why.len - 1]);
if (said.ptr != why.ptr) @memcpy(why[0..said.len], said);
why[said.len] = 0;
@@ -436,21 +436,13 @@ pub fn readZon(gpa: std.mem.Allocator, bytes: []const u8, label: []const u8) !Pa
var parsed: Parsed = .{ .value = undefined, .arena = .init(gpa) };
errdefer parsed.deinit();
const arena = parsed.arena.allocator();
- const source = try gpa.dupeZ(u8, bytes);
+ const source = try gpa.dupeSentinel(u8, bytes, 0);
defer gpa.free(source);
- parsed.value = if (builtin.os.tag == .emscripten or builtin.os.tag == .freestanding)
- std.zon.parse.fromSliceAlloc(State, arena, source, null, .{ .free_on_error = false }) catch |err| {
- if (err == error.ParseZon) log.err("parse dump {s}: {s}", .{ label, @errorName(err) });
- return err;
- }
- else blk: {
- var diag: std.zon.parse.Diagnostics = .{};
- defer diag.deinit(arena);
- break :blk std.zon.parse.fromSliceAlloc(State, arena, source, &diag, .{ .free_on_error = false }) catch |err| {
- if (err == error.ParseZon) log.err("parse dump {s}: {f}", .{ label, diag });
- return err;
- };
+ var diag: std.zon.parse.Diagnostics = undefined;
+ parsed.value = std.zon.parse.fromSlice(State, .{ .gpa = gpa, .arena = arena, .source = source, .diagnostics = &diag }) catch |err| {
+ if (err == error.ParseZon) log.err("{f}", .{diag.fmt(label)});
+ return err;
};
try validate(parsed.value);
return parsed;